Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Further tweaks to support libav from wheezy

Browse Source
This commit is contained in:
Sergey Sharybin
2013-01-13 17:54:09 +00:00
parent 884d7caa24
commit f102953634
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ffmpeg/ffmpeg_compat.h
View File

@@ -113,7 +113,7 @@ int av_opt_set_double(void *obj, const char *name, double val, int search_flags)
#define avformat_close_input(x) av_close_input_file(*(x)) #define avformat_close_input(x) av_close_input_file(*(x))
#endif #endif
#if ((LIBAVCODEC_VERSION_MAJOR < 53) || (LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR < 42)) #if ((LIBAVCODEC_VERSION_MAJOR < 53) || (LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR < 35))
static inline static inline
int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)
{ {
@@ -122,7 +122,7 @@ int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)
} }
#endif #endif
#if ((LIBAVFORMAT_VERSION_MAJOR < 53) || (LIBAVFORMAT_VERSION_MAJOR == 53 && LIBAVFORMAT_VERSION_MINOR < 24)) #if ((LIBAVFORMAT_VERSION_MAJOR < 53) || (LIBAVFORMAT_VERSION_MAJOR == 53 && LIBAVFORMAT_VERSION_MINOR < 21))
static inline static inline
AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c) AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c)
{ {