[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38446] trunk/blender/intern/ffmpeg/ ffmpeg_compat.h: Fixed compile error on Fedora 15, when FFMPEG was enabled.

Jiri Hnidek jiri.hnidek at tul.cz
Sun Jul 17 12:28:31 CEST 2011


Revision: 38446
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38446
Author:   jiri
Date:     2011-07-17 10:28:31 +0000 (Sun, 17 Jul 2011)
Log Message:
-----------
Fixed compile error on Fedora 15, when FFMPEG was enabled.

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-07-17 10:22:20 UTC (rev 38445)
+++ trunk/blender/intern/ffmpeg/ffmpeg_compat.h	2011-07-17 10:28:31 UTC (rev 38446)
@@ -40,7 +40,7 @@
 #define FFMPEG_HAVE_AVIO 1
 #endif
 
-#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)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 122))
+#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)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 121))
 #define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
 #endif
 




More information about the Bf-blender-cvs mailing list