Revision: 36982
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36982
Author: schlaile
Date: 2011-05-28 14:16:56 +0000 (Sat, 28 May 2011)
Log Message:
-----------
== FFMPEG ==
Did some fine-tuning for AVOption -> AVOption2 crazyness
Modified Paths:
--------------
trunk/blender/intern/ffmpeg/ffmpeg_compat.h
Modified: trunk/blender/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- trunk/blender/intern/ffmpeg/ffmpeg_compat.h 2011-05-28 14:15:48 UTC (rev
36981)
+++ trunk/blender/intern/ffmpeg/ffmpeg_compat.h 2011-05-28 14:16:56 UTC (rev
36982)
@@ -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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
