[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28086] trunk/blender/source/blender/imbuf /intern/anim.c: Fix for previous FFMPEG commit, needs extra version ifdefs

[Matt Ebb]

Revision: 28086
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28086
Author:   broken
Date:     2010-04-08 08:10:41 +0200 (Thu, 08 Apr 2010)

Log Message:
-----------
Fix for previous FFMPEG commit, needs extra version ifdefs

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/anim.c

Modified: trunk/blender/source/blender/imbuf/intern/anim.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim.c    2010-04-08 04:49:08 UTC 
(rev 28085)
+++ trunk/blender/source/blender/imbuf/intern/anim.c    2010-04-08 06:10:41 UTC 
(rev 28086)
@@ -659,7 +659,8 @@
        int pos_found = 1;
        int filter_y = 0;
 
-#if (LIBAVCODEC_VERSION_MAJOR >= 52) && (LIBAVCODEC_VERSION_MINOR >= 29)
+#if (LIBAVCODEC_VERSION_MAJOR >= 52) && (LIBAVCODEC_VERSION_MINOR >= 29) && \
+        (LIBSWSCALE_VERSION_MAJOR >= 10) && (LIBSWSCALE_VERSION_MINOR >= 0)
        /* The following for color space determination */
        int srcRange, dstRange, brightness, contrast, saturation;
        int *inv_table, *table;


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