[FFmpeg-cvslog] lavc/dirac_dwt: fix building without asm

Michael Bradshaw git at videolan.org
Sat Feb 6 01:15:08 CET 2016


ffmpeg | branch: master | Michael Bradshaw <mjbshaw at google.com> | Sat Feb  6 01:14:19 2016 +0100| [1c40bccc0949f24bde1cd51194367a4a9fd490c5] | committer: Carl Eugen Hoyos

lavc/dirac_dwt: fix building without asm

clang needs HAVE_MMX to be first in order to avoid an undefined
reference error.

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

 libavcodec/dirac_dwt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dirac_dwt.c b/libavcodec/dirac_dwt.c
index 6cf32ae..9d74e3b 100644
--- a/libavcodec/dirac_dwt.c
+++ b/libavcodec/dirac_dwt.c
@@ -54,7 +54,7 @@ int ff_spatial_idwt_init2(DWTContext *d, uint8_t *buffer, int width, int height,
         return AVERROR_INVALIDDATA;
     }
 
-    if (bit_depth == 8 && HAVE_MMX)
+    if (HAVE_MMX && bit_depth == 8)
         ff_spatial_idwt_init_mmx(d, type);
     return 0;
 }



More information about the ffmpeg-cvslog mailing list