MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-23 19:17:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #328 from sshambar/fixconfig

Browse Source 
Updated configure/makefiles related to Issue #327
This commit is contained in:
ejurgensen
2017-01-12 22:41:47 +01:00
committed by GitHub
parent 45d513d206 ba5d5f0f4a
commit 785ff21045
38 changed files with 832 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/transcode.c
View File

@@ -34,6 +34,9 @@
#include <libavutil/pixdesc.h>
#ifdef HAVE_LIBAVFILTER
# ifdef HAVE_LIBAVUTIL_CHANNEL_LAYOUT_H
# include <libavutil/channel_layout.h>
# endif
# include <libavfilter/avcodec.h>
#else
# include "ffmpeg-compat.h"
@@ -402,7 +405,7 @@ encode_write_frame(struct encode_ctx *ctx, AVFrame *filt_frame, unsigned int str
return ret;
}
#if defined(HAVE_LIBAV_BUFFERSRC_ADD_FRAME_FLAGS) && defined(HAVE_LIBAV_BUFFERSINK_GET_FRAME)
#if defined(HAVE_AV_BUFFERSRC_ADD_FRAME_FLAGS) && defined(HAVE_AV_BUFFERSINK_GET_FRAME)
static int
filter_encode_write_frame(struct encode_ctx *ctx, AVFrame *frame, unsigned int stream_index)
{
@@ -857,7 +860,7 @@ close_output(struct encode_ctx *ctx)
avformat_free_context(ctx->ofmt_ctx);
}
#ifdef HAVE_LIBAV_GRAPH_PARSE_PTR
#ifdef HAVE_AVFILTER_GRAPH_PARSE_PTR
static int
open_filter(struct filter_ctx *filter_ctx, AVCodecContext *dec_ctx, AVCodecContext *enc_ctx, const char *filter_spec)
{