[FFmpeg-cvslog] Fix compilation without HAVE_AVX.

[Reimar Döffinger]

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sun Feb 12 21:37:08 2012 +0100| [f51a0721604deb9aea230522e618b2c4769cad77] | committer: Reimar Döffinger

Fix compilation without HAVE_AVX.

%ifdef HAVE_AVX must now be %if HAVE_AVX.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

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

 libavcodec/x86/dsputil_yasm.asm       |    2 +-
 libavcodec/x86/h264_deblock.asm       |    6 +++---
 libavcodec/x86/h264_deblock_10bit.asm |    8 ++++----
 libavcodec/x86/imdct36_sse.asm        |    4 ++--
 libavcodec/x86/proresdsp.asm          |    2 +-
 libavcodec/x86/v210.asm               |    4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libavcodec/x86/dsputil_yasm.asm b/libavcodec/x86/dsputil_yasm.asm
index 966344f..8e8c10c 100644
--- a/libavcodec/x86/dsputil_yasm.asm
+++ b/libavcodec/x86/dsputil_yasm.asm
@@ -1177,7 +1177,7 @@ cglobal butterflies_float_interleave, 4,4,3, dst, src0, src1, len
 
 INIT_XMM sse
 BUTTERFLIES_FLOAT_INTERLEAVE
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_YMM avx
 BUTTERFLIES_FLOAT_INTERLEAVE
 %endif
diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm
index bff6597..9f517bf 100644
--- a/libavcodec/x86/h264_deblock.asm
+++ b/libavcodec/x86/h264_deblock.asm
@@ -386,7 +386,7 @@ cglobal deblock_h_luma_8_%1, 5,7
 
 INIT_XMM
 DEBLOCK_LUMA sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 DEBLOCK_LUMA avx
 %endif
@@ -507,7 +507,7 @@ INIT_MMX
 DEBLOCK_LUMA mmxext, v8, 8
 INIT_XMM
 DEBLOCK_LUMA sse2, v, 16
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 DEBLOCK_LUMA avx, v, 16
 %endif
@@ -781,7 +781,7 @@ cglobal deblock_h_luma_intra_8_%1, 2,4
 
 INIT_XMM
 DEBLOCK_LUMA_INTRA sse2, v
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 DEBLOCK_LUMA_INTRA avx , v
 %endif
diff --git a/libavcodec/x86/h264_deblock_10bit.asm b/libavcodec/x86/h264_deblock_10bit.asm
index 680abee..562d81c 100644
--- a/libavcodec/x86/h264_deblock_10bit.asm
+++ b/libavcodec/x86/h264_deblock_10bit.asm
@@ -419,7 +419,7 @@ cglobal deblock_h_luma_10_%1, 5,7,15
 
 INIT_XMM
 DEBLOCK_LUMA_64 sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 DEBLOCK_LUMA_64 avx
 %endif
@@ -716,7 +716,7 @@ cglobal deblock_h_luma_intra_10_%1, 4,7,16
 
 INIT_XMM
 DEBLOCK_LUMA_INTRA_64 sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 DEBLOCK_LUMA_INTRA_64 avx
 %endif
@@ -803,7 +803,7 @@ DEBLOCK_LUMA_INTRA mmxext
 INIT_XMM
 DEBLOCK_LUMA sse2
 DEBLOCK_LUMA_INTRA sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 DEBLOCK_LUMA avx
 DEBLOCK_LUMA_INTRA avx
@@ -919,7 +919,7 @@ DEBLOCK_CHROMA mmxext
 %endif
 INIT_XMM
 DEBLOCK_CHROMA sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 DEBLOCK_CHROMA avx
 %endif
diff --git a/libavcodec/x86/imdct36_sse.asm b/libavcodec/x86/imdct36_sse.asm
index e0205ec..336e9f0 100644
--- a/libavcodec/x86/imdct36_sse.asm
+++ b/libavcodec/x86/imdct36_sse.asm
@@ -371,7 +371,7 @@ DEFINE_IMDCT
 INIT_XMM ssse3
 DEFINE_IMDCT
 
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_XMM avx
 DEFINE_IMDCT
 %endif
@@ -719,7 +719,7 @@ cglobal four_imdct36_float, 5,5,16, out, buf, in, win, tmp
 INIT_XMM sse
 DEFINE_FOUR_IMDCT
 
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_XMM avx
 DEFINE_FOUR_IMDCT
 %endif
diff --git a/libavcodec/x86/proresdsp.asm b/libavcodec/x86/proresdsp.asm
index 75448e0..a09d871 100644
--- a/libavcodec/x86/proresdsp.asm
+++ b/libavcodec/x86/proresdsp.asm
@@ -306,7 +306,7 @@ INIT_XMM
 idct_put_fn sse2, 16
 INIT_XMM
 idct_put_fn sse4, 16
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 idct_put_fn avx,  16
 %endif
diff --git a/libavcodec/x86/v210.asm b/libavcodec/x86/v210.asm
index 9ce17c2..f39419e 100644
--- a/libavcodec/x86/v210.asm
+++ b/libavcodec/x86/v210.asm
@@ -76,14 +76,14 @@ cglobal v210_planar_unpack_%1_%2, 5, 5
 
 INIT_XMM
 v210_planar_unpack unaligned, ssse3
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 v210_planar_unpack unaligned, avx
 %endif
 
 INIT_XMM
 v210_planar_unpack aligned, ssse3
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 v210_planar_unpack aligned, avx
 %endif