summaryrefslogtreecommitdiffstats
path: root/postproc
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-06-19 21:28:56 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-06-19 21:28:56 +0000
commit5ff7d7bb6e2e3619831422d97316c94bc98ce902 (patch)
treeea264ad4b78978c5ccd7019b4eb2d4f88959f141 /postproc
parent3f758ed442517bececebbc627e2e3da03b419451 (diff)
downloadmpv-5ff7d7bb6e2e3619831422d97316c94bc98ce902.tar.bz2
mpv-5ff7d7bb6e2e3619831422d97316c94bc98ce902.tar.xz
fixing "internal error in orderYUV" bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10313 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'postproc')
-rw-r--r--postproc/swscale.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/postproc/swscale.c b/postproc/swscale.c
index ec149dd1d7..b0dac620b4 100644
--- a/postproc/swscale.c
+++ b/postproc/swscale.c
@@ -1466,7 +1466,7 @@ static inline void sws_orderYUV(int format, uint8_t * sortedP[], int sortedStrid
sortedStride[1]= stride[2];
sortedStride[2]= stride[1];
}
- else if(isPacked(format) || isGray(format))
+ else if(isPacked(format) || isGray(format) || format == IMGFMT_Y8)
{
sortedP[0]= p[0];
sortedP[1]=
@@ -2096,6 +2096,7 @@ int sws_scale(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcS
sws_orderYUV(c->origSrcFormat, src, srcStride, srcParam, srcStrideParam);
sws_orderYUV(c->origDstFormat, dst, dstStride, dstParam, dstStrideParam);
//printf("sws: slice %d %d\n", srcSliceY, srcSliceH);
+
return c->swScale(c, src, srcStride, srcSliceY, srcSliceH, dst, dstStride);
}