aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-30 06:21:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-30 06:23:39 +0200
commit421b21ca8a02a346ba03cea3bb2ecc33f791fc30 (patch)
tree9e851d9b8c2a499a8a054d9e9a30096f3f849a3b
parentf0c78b0769ca9918c3600254894e9ce2ca19d924 (diff)
downloadffmpeg-421b21ca8a02a346ba03cea3bb2ecc33f791fc30.tar.gz
sws: dont use the optimized 410->420 unscaled conversion when height%4
Fixes Ticket3594 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libswscale/swscale_unscaled.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 18c35429f9..6c24854e35 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -1585,7 +1585,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;