Mercurial > mplayer.hg
changeset 7725:f2c843e36dc9
fixing yuy2 upscaling (use -sws 0 for the faster but uglier variant)
| author | michael |
|---|---|
| date | Sun, 13 Oct 2002 19:46:51 +0000 |
| parents | 619fd5403fd0 |
| children | 830d81368d21 |
| files | postproc/swscale.c |
| diffstat | 1 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/postproc/swscale.c Sun Oct 13 18:35:15 2002 +0000 +++ b/postproc/swscale.c Sun Oct 13 19:46:51 2002 +0000 @@ -2047,16 +2047,6 @@ 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 @@ && (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){