[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53776] trunk/blender/intern/ffmpeg/ ffmpeg_compat.h: Tweak to ffmpeg compatibility layer to support debian' s wheezy libav

[Sergey Sharybin]

Revision: 53776
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53776
Author:   nazgul
Date:     2013-01-13 17:10:10 +0000 (Sun, 13 Jan 2013)
Log Message:
-----------
Tweak to ffmpeg compatibility layer to support debian's wheezy libav

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 16:42:02 UTC (rev 53775)
+++ trunk/blender/intern/ffmpeg/ffmpeg_compat.h	2013-01-13 17:10:10 UTC (rev 53776)
@@ -74,7 +74,9 @@
 
 #if ((LIBAVUTIL_VERSION_MAJOR > 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR >= 32))
 #define FFMPEG_FFV1_ALPHA_SUPPORTED
-#else
+#endif
+
+#if ((LIBAVUTIL_VERSION_MAJOR < 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR < 22))
 static inline
 int av_opt_set(void *obj, const char *name, const char *val, int search_flags)
 {