diff options
| author | Vitor Sessak <vitor1001@gmail.com> | 2009-05-07 20:41:04 +0000 |
|---|---|---|
| committer | Vitor Sessak <vitor1001@gmail.com> | 2009-05-07 20:41:04 +0000 |
| commit | 5f9ae1983d901e703cd133435c6c87fdaae7b06f (patch) | |
| tree | 23d9f7934719530766d75cb4ca9f2a43fb22caa2 /libswscale/swscale.c | |
| parent | fc430e8fab5feb13b4e743aa64f30ff440d3e253 (diff) | |
| download | ffmpeg-streaming-5f9ae1983d901e703cd133435c6c87fdaae7b06f.zip ffmpeg-streaming-5f9ae1983d901e703cd133435c6c87fdaae7b06f.tar.gz | |
Fix sliced yuv410 -> yuv420 conversion
Originally committed as revision 29272 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 19d93dd..a0954ad 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2108,11 +2108,15 @@ static int yvu9toyv12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int } if (c->dstFormat==PIX_FMT_YUV420P || c->dstFormat==PIX_FMT_YUVA420P){ - planar2x(src[1], dst[1], c->chrSrcW, c->chrSrcH, srcStride[1], dstStride[1]); - planar2x(src[2], dst[2], c->chrSrcW, c->chrSrcH, srcStride[2], dstStride[2]); + planar2x(src[1], dst[1] + dstStride[1]*(srcSliceY >> 1), c->chrSrcW, + srcSliceH >> 2, srcStride[1], dstStride[1]); + planar2x(src[2], dst[2] + dstStride[2]*(srcSliceY >> 1), c->chrSrcW, + srcSliceH >> 2, srcStride[2], dstStride[2]); }else{ - planar2x(src[1], dst[2], c->chrSrcW, c->chrSrcH, srcStride[1], dstStride[2]); - planar2x(src[2], dst[1], c->chrSrcW, c->chrSrcH, srcStride[2], dstStride[1]); + planar2x(src[1], dst[2] + dstStride[2]*(srcSliceY >> 1), c->chrSrcW, + srcSliceH >> 2, srcStride[1], dstStride[2]); + planar2x(src[2], dst[1] + dstStride[1]*(srcSliceY >> 1), c->chrSrcW, + srcSliceH >> 2, srcStride[2], dstStride[1]); } if (dst[3]) fillPlane(dst[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255); |
