[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37745] trunk/blender/intern/ffmpeg/ ffmpeg_compat.h: fix for building on arch linux with ffmpeg version:

[Campbell Barton]

Revision: 37745
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37745
Author:   campbellbarton
Date:     2011-06-23 06:11:13 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
fix for building on arch linux with ffmpeg version:
 LIBAVCODEC_VERSION_MAJOR 52
 LIBAVCODEC_VERSION_MINOR 122

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-06-23 05:58:44 UTC (rev 
37744)
+++ trunk/blender/intern/ffmpeg/ffmpeg_compat.h 2011-06-23 06:11:13 UTC (rev 
37745)
@@ -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))
+#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))
 #define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
 #endif
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs