aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-23 20:18:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-23 20:18:21 +0200
commit90640cc7649311f3c609998946f4c6c2dc4a4111 (patch)
tree7e8a4ed318eb70f93dcd4d7a77d8f85ae721dfa5
parent8b4b2ddf8d46eb77996ea0a8f2c5788959cf5170 (diff)
downloadffmpeg-90640cc7649311f3c609998946f4c6c2dc4a4111.tar.gz
sws: fix assert failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libswscale/swscale.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 502cb438da..f0bde4795b 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -2678,7 +2678,8 @@ static int swScale(SwsContext *c, const uint8_t* src[],
|| yuv2planeX == yuv2planeX_9LE_c
|| yuv2planeX == yuv2planeX_16BE_c
|| yuv2planeX == yuv2planeX_16LE_c
- || yuv2planeX == yuv2planeX_8_c));
+ || yuv2planeX == yuv2planeX_8_c) || !ARCH_X86);
+
if(use_mmx_vfilter){
vLumFilter= c->lumMmxFilter;
vChrFilter= c->chrMmxFilter;