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:
authorPeter Schlaile <peter@schlaile.de>2011-05-28 18:16:56 +0400
committerPeter Schlaile <peter@schlaile.de>2011-05-28 18:16:56 +0400
commitce8467ffd3407197b16c267ecee9030079e13a37 (patch)
tree506cfc7babc7910db7ca9a6fa18737b9fdc6cbcb /intern/ffmpeg
parent9b5800bcd7be7998e804f34e67251f68b37672fb (diff)
== FFMPEG ==
Did some fine-tuning for AVOption -> AVOption2 crazyness
Diffstat (limited to 'intern/ffmpeg')
-rw-r--r--intern/ffmpeg/ffmpeg_compat.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
index 06e170837d1..ab819f41ac3 100644
--- a/intern/ffmpeg/ffmpeg_compat.h
+++ b/intern/ffmpeg/ffmpeg_compat.h
@@ -40,7 +40,7 @@
#define FFMPEG_HAVE_AVIO 1
#endif
-#if (LIBAVFORMAT_VERSION_MAJOR > 53) || ((LIBAVFORMAT_VERSION_MAJOR >= 53) && (LIBAVFORMAT_VERSION_MINOR >= 1))
+#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1))
#define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
#endif