Mercurial > mplayer.hg

changeset 30204:2b19714f79d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ignore 0-height slice in sws_scale, otherwise a final 0-height slice will cause libswscale to assume the incorrect slice order and complain about slices starting in the middle.
author reimar
date Fri, 08 Jan 2010 19:31:33 +0000
parents 3888e3862fe0
children 089c49dd7f9f
files libswscale/swscale.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Fri Jan 08 19:21:14 2010 +0000
+++ b/libswscale/swscale.c	Fri Jan 08 19:31:33 2010 +0000
@@ -2966,6 +2966,10 @@
     uint8_t* src2[4]= {src[0], src[1], src[2], src[3]};
     uint8_t* dst2[4]= {dst[0], dst[1], dst[2], dst[3]};
 
+    // do not mess up sliceDir if we have a "trailing" 0-size slice
+    if (srcSliceH == 0)
+        return 0;
+
     if (c->sliceDir == 0 && srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) {
         av_log(c, AV_LOG_ERROR, "Slices start in the middle!\n");
         return 0;