[FFmpeg-cvslog] r29675 - trunk/libswscale/swscale.c

ramiro subversion
Sun Sep 13 03:49:40 CEST 2009


Author: ramiro
Date: Sun Sep 13 03:49:40 2009
New Revision: 29675

Log:
Reset slice direction at end of each frame.

Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Sat Sep 12 22:10:22 2009	(r29674)
+++ trunk/libswscale/swscale.c	Sun Sep 13 03:49:40 2009	(r29675)
@@ -3167,6 +3167,10 @@ int sws_scale(SwsContext *c, uint8_t* sr
         reset_ptr(src2, c->srcFormat);
         reset_ptr(dst2, c->dstFormat);
 
+        /* reset slice direction at end of frame */
+        if (srcSliceY + srcSliceH == c->srcH)
+            c->sliceDir = 0;
+
         return c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2, dstStride2);
     } else {
         // slices go from bottom to top => we flip the image internally
@@ -3186,6 +3190,10 @@ int sws_scale(SwsContext *c, uint8_t* sr
         reset_ptr(src2, c->srcFormat);
         reset_ptr(dst2, c->dstFormat);
 
+        /* reset slice direction at end of frame */
+        if (!srcSliceY)
+            c->sliceDir = 0;
+
         return c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH, srcSliceH, dst2, dstStride2);
     }
 }



More information about the ffmpeg-cvslog mailing list