[FFmpeg-cvslog] swscale: fix yuv2yuvX_8 assembly on x86

Kieran Kunhya git at videolan.org
Sun Nov 30 22:41:54 CET 2014


ffmpeg | branch: release/2.4 | Kieran Kunhya <kieran at kunhya.com> | Sun Nov  9 20:39:35 2014 +0100| [6f580e87350c817ac3176a9e75d158bf3faad4e3] | committer: Michael Niedermayer

swscale: fix yuv2yuvX_8 assembly on x86

use_mmx_vfilter check/fix by commiter
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b546023b9319cbaefb638a2eeac56bdbf53d6f8b)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f580e87350c817ac3176a9e75d158bf3faad4e3
---

 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 c4c0e28..7c51979 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){ \



More information about the ffmpeg-cvslog mailing list