[FFmpeg-cvslog] avcodec/x86/cavsdsp: Put MMX code under mmx check

Michael Niedermayer git at videolan.org
Mon Mar 6 17:48:47 EET 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Mar  5 03:14:27 2017 +0100| [835d9f299cf6b3704989a7b3eccfa1c2ec6866d9] | committer: Michael Niedermayer

avcodec/x86/cavsdsp: Put MMX code under mmx check

Without this the FPU state becomes trashed and causes mysterious
fate failures with cpuflags=0

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/x86/cavsdsp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c
index 4b20e65..e57d8be 100644
--- a/libavcodec/x86/cavsdsp.c
+++ b/libavcodec/x86/cavsdsp.c
@@ -565,7 +565,9 @@ av_cold void ff_cavsdsp_init_x86(CAVSDSPContext *c, AVCodecContext *avctx)
 {
     av_unused int cpu_flags = av_get_cpu_flags();
 
-    cavsdsp_init_mmx(c, avctx);
+    if (X86_MMX(cpu_flags))
+        cavsdsp_init_mmx(c, avctx);
+
 #if HAVE_AMD3DNOW_INLINE
     if (INLINE_AMD3DNOW(cpu_flags))
         cavsdsp_init_3dnow(c, avctx);



More information about the ffmpeg-cvslog mailing list