From 6f580e87350c817ac3176a9e75d158bf3faad4e3 Mon Sep 17 00:00:00 2001 From: Kieran Kunhya Date: Sun, 9 Nov 2014 20:39:35 +0100 Subject: [PATCH] swscale: fix yuv2yuvX_8 assembly on x86 use_mmx_vfilter check/fix by commiter Signed-off-by: Michael Niedermayer (cherry picked from commit b546023b9319cbaefb638a2eeac56bdbf53d6f8b) Signed-off-by: Michael Niedermayer --- libswscale/x86/swscale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index c4c0e28e53..7c51979bb2 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -425,7 +425,7 @@ switch(c->dstBpc){ \ case 16: do_16_case; break; \ case 10: if (!isBE(c->dstFormat)) vscalefn = ff_yuv2planeX_10_ ## opt; break; \ case 9: if (!isBE(c->dstFormat)) vscalefn = ff_yuv2planeX_9_ ## opt; break; \ - default: if (condition_8bit) /*vscalefn = ff_yuv2planeX_8_ ## opt;*/ break; \ + case 8: if ((condition_8bit) && !c->use_mmx_vfilter) vscalefn = ff_yuv2planeX_8_ ## opt; break; \ } #define ASSIGN_VSCALE_FUNC(vscalefn, opt1, opt2, opt2chk) \ switch(c->dstBpc){ \