Commit 79435dc0 authored by reimar's avatar reimar

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: file:///var/local/repositories/mplayer/trunk/libswscale@30246 b3059339-0415-0410-9bf9-f77b7e298cf2
parent aa49d640
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment