diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-13 19:46:51 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-13 19:46:51 +0000 |
| commit | b363309d0478db0f7e0d082fbb28e86aa3db4a4a (patch) | |
| tree | 0b81972fe4f74270bc6fe9931e9b4a4c53dbe8aa /postproc | |
| parent | 51284eb6220d182d2a1f3bc758fe3dd3060d2b01 (diff) | |
| download | mpv-b363309d0478db0f7e0d082fbb28e86aa3db4a4a.tar.bz2 mpv-b363309d0478db0f7e0d082fbb28e86aa3db4a4a.tar.xz | |
fixing yuy2 upscaling (use -sws 0 for the faster but uglier variant)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7726 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to '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){ |