diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-21 10:20:16 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-21 10:20:16 +0000 |
| commit | 6f348086914992ca739eb57d2233593ef766218d (patch) | |
| tree | 2fe679e6a0a565c80da31ee69fe2528e41f290e9 /libswscale | |
| parent | 31e2d5d3215fcab9ae8594b2465350682acafecf (diff) | |
Fix planarCopy to ignore the GRAY8 "pseudo"-palette, fixes libavtest regression test.
Originally committed as revision 29021 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index e9b65c452d..bc35ad59ab 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2118,7 +2118,9 @@ static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli int height= (plane==0 || plane==3) ? srcSliceH: -((-srcSliceH)>>c->chrDstVSubSample); if (!dst[plane]) continue; - if (!src[plane]) + // ignore palette for GRAY8 + if (plane == 1 && !dst[2]) continue; + if (!src[plane] || (plane == 1 && !src[2])) fillPlane(dst[plane], dstStride[plane], length, height, y, (plane==3) ? 255 : 128); else { |