Mercurial > mplayer.hg
comparison postproc/swscale.c @ 10312:b71452194fff
fixing "internal error in orderYUV" bug
| author | michael |
|---|---|
| date | Thu, 19 Jun 2003 21:28:56 +0000 |
| parents | 1129ff2d25c6 |
| children | b1c40065bcff |
comparison
equal
deleted
inserted
replaced
| 10311:87043624b0d8 | 10312:b71452194fff |
|---|---|
| 1464 sortedP[2]= p[1]; | 1464 sortedP[2]= p[1]; |
| 1465 sortedStride[0]= stride[0]; | 1465 sortedStride[0]= stride[0]; |
| 1466 sortedStride[1]= stride[2]; | 1466 sortedStride[1]= stride[2]; |
| 1467 sortedStride[2]= stride[1]; | 1467 sortedStride[2]= stride[1]; |
| 1468 } | 1468 } |
| 1469 else if(isPacked(format) || isGray(format)) | 1469 else if(isPacked(format) || isGray(format) || format == IMGFMT_Y8) |
| 1470 { | 1470 { |
| 1471 sortedP[0]= p[0]; | 1471 sortedP[0]= p[0]; |
| 1472 sortedP[1]= | 1472 sortedP[1]= |
| 1473 sortedP[2]= NULL; | 1473 sortedP[2]= NULL; |
| 1474 sortedStride[0]= stride[0]; | 1474 sortedStride[0]= stride[0]; |
| 2094 uint8_t *src[3]; | 2094 uint8_t *src[3]; |
| 2095 uint8_t *dst[3]; | 2095 uint8_t *dst[3]; |
| 2096 sws_orderYUV(c->origSrcFormat, src, srcStride, srcParam, srcStrideParam); | 2096 sws_orderYUV(c->origSrcFormat, src, srcStride, srcParam, srcStrideParam); |
| 2097 sws_orderYUV(c->origDstFormat, dst, dstStride, dstParam, dstStrideParam); | 2097 sws_orderYUV(c->origDstFormat, dst, dstStride, dstParam, dstStrideParam); |
| 2098 //printf("sws: slice %d %d\n", srcSliceY, srcSliceH); | 2098 //printf("sws: slice %d %d\n", srcSliceY, srcSliceH); |
| 2099 | |
| 2099 return c->swScale(c, src, srcStride, srcSliceY, srcSliceH, dst, dstStride); | 2100 return c->swScale(c, src, srcStride, srcSliceY, srcSliceH, dst, dstStride); |
| 2100 } | 2101 } |
| 2101 | 2102 |
| 2102 SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur, | 2103 SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur, |
| 2103 float lumaSharpen, float chromaSharpen, | 2104 float lumaSharpen, float chromaSharpen, |