diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2003-06-19 21:28:56 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2003-06-19 21:28:56 +0000 |
commit | a4c90ea3ba03b196a7acb54b77cbdfce49b6df15 (patch) | |
tree | 7742aa04aef7cad09d494b2d1da335d700cb4206 /postproc | |
parent | da3b9756306ad8edde9e5b1fc6d6e169cc202681 (diff) | |
download | ffmpeg-a4c90ea3ba03b196a7acb54b77cbdfce49b6df15.tar.gz |
fixing "internal error in orderYUV" bug
Originally committed as revision 10313 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
Diffstat (limited to 'postproc')
-rw-r--r-- | postproc/swscale.c | 3 |
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); } |