From c8945742364cdf358e3583667817b68d9534135b Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 8 Jan 2010 19:31:33 +0000 Subject: 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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30246 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index f4a65b2c85..0a989cafe9 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2966,6 +2966,10 @@ int sws_scale(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, 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; -- cgit v1.2.3