diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-13 21:54:09 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-13 21:54:09 +0400 |
| commit | f10295363462869df19c03940cc5acabcca506c1 (patch) | |
| tree | 558c8124dfd9f17cd72a0e2e37df126475fbe2ce /intern/ffmpeg | |
| parent | 884d7caa24fda6574163c07a764ac997cce82a72 (diff) | |
Further tweaks to support libav from wheezy
Diffstat (limited to 'intern/ffmpeg')
| -rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index 0174d3c5b90..c07dc869291 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -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)) #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 int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) { @@ -122,7 +122,7 @@ int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) } #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 AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c) { |