[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12950] trunk/blender/extern/ffmpeg: == FFMPEG ==

[Peter Schlaile]

Revision: 12950
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12950
Author:   schlaile
Date:     2007-12-19 23:48:00 +0100 (Wed, 19 Dec 2007)

Log Message:
-----------
== FFMPEG ==

Fix for broken RAW-AVI support of ffmpeg. (libswscale is a little bit
over optimized...)

Fixes probably also Bug #7475.

Modified Paths:
--------------
    trunk/blender/extern/ffmpeg/libswscale/swscale.c
    trunk/blender/extern/ffmpeg/patches/README

Added Paths:
-----------
    trunk/blender/extern/ffmpeg/patches/swscale_stride_bugfix.patch

Modified: trunk/blender/extern/ffmpeg/libswscale/swscale.c
===================================================================
--- trunk/blender/extern/ffmpeg/libswscale/swscale.c	2007-12-19 22:37:38 UTC (rev 12949)
+++ trunk/blender/extern/ffmpeg/libswscale/swscale.c	2007-12-19 22:48:00 UTC (rev 12950)
@@ -1678,7 +1678,7 @@
 
     if(conv)
     {
-        if (dstStride[0]*srcBpp == srcStride[0]*dstBpp)
+        if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0)
             conv(src[0], dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
         else
         {

Modified: trunk/blender/extern/ffmpeg/patches/README
===================================================================
--- trunk/blender/extern/ffmpeg/patches/README	2007-12-19 22:37:38 UTC (rev 12949)
+++ trunk/blender/extern/ffmpeg/patches/README	2007-12-19 22:48:00 UTC (rev 12950)
@@ -1,8 +1,8 @@
 In this directory, I collect patches to FFMPEG, to make it
 work / faster with blender.
 
-Currently, there is only a small MMX acceleration for the
-YUV -> BGRA32 
-transformation.
+Currently: 
+- MMX acceleration for the YUV -> BGRA32 transformation.
+- Bugfix for swscale, that screwed up RGB -> RGB32 with RAW AVIs
 
 -- Peter 
\ No newline at end of file

Added: trunk/blender/extern/ffmpeg/patches/swscale_stride_bugfix.patch
===================================================================
--- trunk/blender/extern/ffmpeg/patches/swscale_stride_bugfix.patch	                        (rev 0)
+++ trunk/blender/extern/ffmpeg/patches/swscale_stride_bugfix.patch	2007-12-19 22:48:00 UTC (rev 12950)
@@ -0,0 +1,13 @@
+Index: swscale.c
+===================================================================
+--- swscale.c	(revision 12850)
++++ swscale.c	(working copy)
+@@ -1678,7 +1678,7 @@
+ 
+     if(conv)
+     {
+-        if (dstStride[0]*srcBpp == srcStride[0]*dstBpp)
++        if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0)
+             conv(src[0], dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
+         else
+         {