aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-30 06:21:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-10 21:55:41 +0200
commit8e8dc210cd5a1c5754accfc665499316137a19fd (patch)
treea918be841240313adea9e6249b5fad9b2782d303 /libswscale
parent3af977d4d64409d4cd8a07c2d27ed880f61e0cd8 (diff)
downloadffmpeg-8e8dc210cd5a1c5754accfc665499316137a19fd.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) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
-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 44a6902e24..deabce2f5f 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -943,7 +943,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;