From 236699830d754d1a073a27ac3597069a7b61a5cd Mon Sep 17 00:00:00 2001 From: Ken Mandelberg Date: Tue, 7 Oct 2003 22:41:56 +0000 Subject: [PATCH] Fixed the brokeness and also bgr32 should work now. Patch by Ken Mandelberg Originally committed as revision 11038 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc --- postproc/yuv2rgb_mlib.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/postproc/yuv2rgb_mlib.c b/postproc/yuv2rgb_mlib.c index 015d599662..0b0fb95951 100644 --- a/postproc/yuv2rgb_mlib.c +++ b/postproc/yuv2rgb_mlib.c @@ -42,8 +42,8 @@ static int mlib_YUV2ARGB420_32(SwsContext *c, uint8_t* src[], int srcStride[], i assert(srcStride[1] == srcStride[2]); - mlib_VideoColorYUV2ARGB420(dst[0], src[0], src[1], src[2], c->dstW, - c->dstH, dstStride[0], srcStride[0], srcStride[1]); + mlib_VideoColorYUV2ARGB420(dst[0]+srcSliceY*dstStride[0], src[0], src[1], src[2], c->dstW, + srcSliceH, dstStride[0], srcStride[0], srcStride[1]); return srcSliceH; } @@ -56,8 +56,8 @@ static int mlib_YUV2ABGR420_32(SwsContext *c, uint8_t* src[], int srcStride[], i assert(srcStride[1] == srcStride[2]); - mlib_VideoColorYUV2ABGR420(dst[0], src[0], src[1], src[2], c->dstW, - c->dstH, dstStride[0], srcStride[0], srcStride[1]); + mlib_VideoColorYUV2ABGR420(dst[0]+srcSliceY*dstStride[0], src[0], src[1], src[2], c->dstW, + srcSliceH, dstStride[0], srcStride[0], srcStride[1]); return srcSliceH; } @@ -70,8 +70,8 @@ static int mlib_YUV2RGB420_24(SwsContext *c, uint8_t* src[], int srcStride[], in assert(srcStride[1] == srcStride[2]); - mlib_VideoColorYUV2RGB420(dst[0], src[0], src[1], src[2], c->dstW, - c->dstH, dstStride[0], srcStride[0], srcStride[1]); + mlib_VideoColorYUV2RGB420(dst[0]+srcSliceY*dstStride[0], src[0], src[1], src[2], c->dstW, + srcSliceH, dstStride[0], srcStride[0], srcStride[1]); return srcSliceH; } @@ -81,7 +81,7 @@ SwsFunc yuv2rgb_init_mlib(SwsContext *c) switch(c->dstFormat){ case IMGFMT_RGB24: return mlib_YUV2RGB420_24; case IMGFMT_RGB32: return mlib_YUV2ARGB420_32; - case IMGFMT_BGR32: return mlib_YUV2ARGB420_32; + case IMGFMT_BGR32: return mlib_YUV2ABGR420_32; default: return NULL; } }