[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36963] trunk/blender/intern/ffmpeg/ ffmpeg_compat.h: == FFMPEG ==

[Peter Schlaile]

Revision: 36963
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36963
Author:   schlaile
Date:     2011-05-28 00:07:33 +0000 (Sat, 28 May 2011)
Log Message:
-----------
== FFMPEG ==

Small fix for a very old bug in swscaler color space support detection.

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-27 23:51:40 UTC (rev 36962)
+++ trunk/blender/intern/ffmpeg/ffmpeg_compat.h	2011-05-28 00:07:33 UTC (rev 36963)
@@ -61,8 +61,8 @@
 #define FFMPEG_HAVE_AVMEDIA_TYPES 1
 #endif
 
-#if (LIBAVCODEC_VERSION_MAJOR >= 52) && (LIBAVCODEC_VERSION_MINOR >= 29) && \
-	 (LIBSWSCALE_VERSION_MAJOR >= 0) && (LIBSWSCALE_VERSION_MINOR >= 10)
+#if ((LIBAVCODEC_VERSION_MAJOR > 52) || (LIBAVCODEC_VERSION_MAJOR >= 52) && (LIBAVCODEC_VERSION_MINOR >= 29)) && \
+	((LIBSWSCALE_VERSION_MAJOR > 0) || (LIBSWSCALE_VERSION_MAJOR >= 0) && (LIBSWSCALE_VERSION_MINOR >= 10))
 #define FFMPEG_SWSCALE_COLOR_SPACE_SUPPORT
 #endif