diff options
| author | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-01 21:30:36 +0000 |
|---|---|---|
| committer | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-01 21:30:36 +0000 |
| commit | fa7e2d8f5c35a2aba96e5f114a5870d85656f442 (patch) | |
| tree | 5453e86a67e0b3b2426c0260110dbde360cc2fae /libswscale | |
| parent | 6c6be8ac1e73ca577dd121df652d2e0b1409beb5 (diff) | |
| download | mpv-fa7e2d8f5c35a2aba96e5f114a5870d85656f442.tar.bz2 mpv-fa7e2d8f5c35a2aba96e5f114a5870d85656f442.tar.xz | |
Fix regression when converting to nv12/nv21.
Patch by Guennadi Liakhovetski, g D liakhovetski A gmx D de
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29464 b3059339-0415-0410-9bf9-f77b7e298cf2
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 59d4d841fe..55871c5074 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2759,7 +2759,9 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d || (isGray(dstFormat) && isGray(srcFormat)) || (isPlanarYUV(srcFormat) && isPlanarYUV(dstFormat) && c->chrDstHSubSample == c->chrSrcHSubSample - && c->chrDstVSubSample == c->chrSrcVSubSample)) + && c->chrDstVSubSample == c->chrSrcVSubSample + && dstFormat != PIX_FMT_NV12 && dstFormat != PIX_FMT_NV21 + && srcFormat != PIX_FMT_NV12 && srcFormat != PIX_FMT_NV21)) { if (isPacked(c->srcFormat)) c->swScale= packedCopy; |