diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 06:21:58 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-05-01 18:32:45 +0200 |
| commit | 3d79041f85498eee309bc3c2adc985a9686a5057 (patch) | |
| tree | 91a29e89ab8a1021717b91bfe5b4ccc254f567c3 | |
| parent | 2c71734d9ef18b991c2947b67c4c663e0b09b72e (diff) | |
| download | ffmpeg-3d79041f85498eee309bc3c2adc985a9686a5057.tar.gz | |
sws: dont use the optimized 410->420 unscaled conversion when height%4
Fixes Ticket3594
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 421b21ca8a02a346ba03cea3bb2ecc33f791fc30)
| -rw-r--r-- | libswscale/swscale_unscaled.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 8da73b26c2..f6c3b3559b 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1017,7 +1017,7 @@ void ff_get_unscaled_swscale(SwsContext *c) c->swScale = ff_yuv2rgb_get_func_ptr(c); } - if (srcFormat == AV_PIX_FMT_YUV410P && + if (srcFormat == AV_PIX_FMT_YUV410P && !(dstH & 3) && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P) && !(flags & SWS_BITEXACT)) { c->swScale = yvu9ToYv12Wrapper; |