Commit dec459ae authored by sdrik's avatar sdrik

Use a simpler and more general check for the gray case in the planarCopy function

git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@29009 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 7a262d72
...@@ -1989,11 +1989,8 @@ static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli ...@@ -1989,11 +1989,8 @@ static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli
int y= plane==0 ? srcSliceY: -((-srcSliceY)>>c->chrDstVSubSample); int y= plane==0 ? srcSliceY: -((-srcSliceY)>>c->chrDstVSubSample);
int height= plane==0 ? srcSliceH: -((-srcSliceH)>>c->chrDstVSubSample); int height= plane==0 ? srcSliceH: -((-srcSliceH)>>c->chrDstVSubSample);
if ((isGray(c->srcFormat) || isGray(c->dstFormat)) && plane>0) if (dst[plane] && !src[plane])
{
if (!isGray(c->dstFormat))
fillPlane(dst[plane], dstStride[plane], length, height, y, 128); fillPlane(dst[plane], dstStride[plane], length, height, y, 128);
}
else else
{ {
if (dstStride[plane]==srcStride[plane] && srcStride[plane] > 0) if (dstStride[plane]==srcStride[plane] && srcStride[plane] > 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