Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-01-13 21:10:10 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-01-13 21:10:10 +0400
commit21e5451c3b5bae099065c3160d6aa52d2f76ecc9 (patch)
tree0dd06fb05d25a3fe3b74fe5be54f5ff8e6afc4c3 /intern/ffmpeg/ffmpeg_compat.h
parent023e7f489c64d6b9ecb708ea551246b6e2eedea8 (diff)
Tweak to ffmpeg compatibility layer to support debian's wheezy libav
Diffstat (limited to 'intern/ffmpeg/ffmpeg_compat.h')
-rw-r--r--intern/ffmpeg/ffmpeg_compat.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
index 5492a7ba88a..0174d3c5b90 100644
--- a/intern/ffmpeg/ffmpeg_compat.h
+++ b/intern/ffmpeg/ffmpeg_compat.h
@@ -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)
{