[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53778] trunk/blender/intern/ffmpeg/ ffmpeg_compat.h: Further tweaks to support libav from wheezy

[Sergey Sharybin]

Revision: 53778
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53778
Author:   nazgul
Date:     2013-01-13 17:54:09 +0000 (Sun, 13 Jan 2013)
Log Message:
-----------
Further tweaks to support libav from wheezy

Modified Paths:
--------------
    trunk/blender/intern/ffmpeg/ffmpeg_compat.h

Modified: trunk/blender/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- trunk/blender/intern/ffmpeg/ffmpeg_compat.h	2013-01-13 17:43:04 UTC (rev 53777)
+++ trunk/blender/intern/ffmpeg/ffmpeg_compat.h	2013-01-13 17:54:09 UTC (rev 53778)
@@ -113,7 +113,7 @@
 #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 @@
 }
 #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)
 {