diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-10-13 19:46:51 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-10-13 19:46:51 +0000 |
| commit | 2ce486d8505c84bc659357689c96c07b0a9aad66 (patch) | |
| tree | 78cdf1186a25469b8c089f47a955241e27c54b95 | |
| parent | 25593e29f25c6acc671b115e0c63dc8653d05705 (diff) | |
| download | ffmpeg-2ce486d8505c84bc659357689c96c07b0a9aad66.tar.gz | |
fixing yuy2 upscaling (use -sws 0 for the faster but uglier variant)
Originally committed as revision 7726 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
| -rw-r--r-- | postproc/swscale.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/postproc/swscale.c b/postproc/swscale.c index 3b2b8d36eb..6962443dac 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -2047,16 +2047,6 @@ SwsContext *getSwsContext(int srcW, int srcH, int srcFormat, int dstW, int dstH, vo_format_name(srcFormat), vo_format_name(dstFormat)); return c; } - /* yv12_to_yuy2 */ - if((srcFormat == IMGFMT_YV12||srcFormat==IMGFMT_I420)&&dstFormat == IMGFMT_YUY2) - { - c->swScale= PlanarToYuy2Wrapper; - - if(flags&SWS_PRINT_INFO) - MSG_INFO("SwScaler: using unscaled %s -> %s special converter\n", - vo_format_name(srcFormat), vo_format_name(dstFormat)); - return c; - } /* yuv2bgr */ if((srcFormat==IMGFMT_YV12 || srcFormat==IMGFMT_I420) && isBGR(dstFormat)) { @@ -2121,6 +2111,17 @@ SwsContext *getSwsContext(int srcW, int srcH, int srcFormat, int dstW, int dstH, && (isBGR(dstFormat) || isRGB(dstFormat)) && needsDither) c->swScale= rgb2rgbWrapper; + + /* yv12_to_yuy2 */ + if((srcFormat == IMGFMT_YV12||srcFormat==IMGFMT_I420)&&dstFormat == IMGFMT_YUY2) + { + c->swScale= PlanarToYuy2Wrapper; + + if(flags&SWS_PRINT_INFO) + MSG_INFO("SwScaler: using unscaled %s -> %s special converter\n", + vo_format_name(srcFormat), vo_format_name(dstFormat)); + return c; + } } if(c->swScale){ |