diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-26 04:24:47 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-26 04:24:47 +0200 |
commit | 0d7f9f033cdd677df3b85aca45491955b87a1abc (patch) | |
tree | 402bf52da86cb6261dcfa046bf27d0c5f4bf4fc7 /libswscale/swscale.c | |
parent | 4db39fdfdb9caeb91ed7fbd87174faa49f8baeda (diff) | |
parent | 8bfdce3a8350a7e7f54fcdecc612ecc0d9a544a9 (diff) |
Merge svn changes up to r27828
Diffstat (limited to 'libswscale/swscale.c')
-rw-r--r-- | libswscale/swscale.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a926bade05..62c0548fd5 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2312,7 +2312,7 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d #ifdef CONFIG_GPL /* yuv2bgr */ if ((srcFormat==PIX_FMT_YUV420P || srcFormat==PIX_FMT_YUV422P) && (isBGR(dstFormat) || isRGB(dstFormat)) - && !(flags & SWS_ACCURATE_RND)) + && !(flags & SWS_ACCURATE_RND) && !(dstH&1)) { c->swScale= yuv2rgb_get_func_ptr(c); } |