Browse Source

Fix compilation without HAVE_AVX.

%ifdef HAVE_AVX must now be %if HAVE_AVX.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
tags/n0.11
Reimar Döffinger 13 years ago
parent
commit
f51a072160
6 changed files with 13 additions and 13 deletions
  1. +1
    -1
      libavcodec/x86/dsputil_yasm.asm
  2. +3
    -3
      libavcodec/x86/h264_deblock.asm
  3. +4
    -4
      libavcodec/x86/h264_deblock_10bit.asm
  4. +2
    -2
      libavcodec/x86/imdct36_sse.asm
  5. +1
    -1
      libavcodec/x86/proresdsp.asm
  6. +2
    -2
      libavcodec/x86/v210.asm

+ 1
- 1
libavcodec/x86/dsputil_yasm.asm View File

@@ -1177,7 +1177,7 @@ cglobal butterflies_float_interleave, 4,4,3, dst, src0, src1, len


INIT_XMM sse INIT_XMM sse
BUTTERFLIES_FLOAT_INTERLEAVE BUTTERFLIES_FLOAT_INTERLEAVE
%ifdef HAVE_AVX
%if HAVE_AVX
INIT_YMM avx INIT_YMM avx
BUTTERFLIES_FLOAT_INTERLEAVE BUTTERFLIES_FLOAT_INTERLEAVE
%endif %endif


+ 3
- 3
libavcodec/x86/h264_deblock.asm View File

@@ -386,7 +386,7 @@ cglobal deblock_h_luma_8_%1, 5,7


INIT_XMM INIT_XMM
DEBLOCK_LUMA sse2 DEBLOCK_LUMA sse2
%ifdef HAVE_AVX
%if HAVE_AVX
INIT_AVX INIT_AVX
DEBLOCK_LUMA avx DEBLOCK_LUMA avx
%endif %endif
@@ -507,7 +507,7 @@ INIT_MMX
DEBLOCK_LUMA mmxext, v8, 8 DEBLOCK_LUMA mmxext, v8, 8
INIT_XMM INIT_XMM
DEBLOCK_LUMA sse2, v, 16 DEBLOCK_LUMA sse2, v, 16
%ifdef HAVE_AVX
%if HAVE_AVX
INIT_AVX INIT_AVX
DEBLOCK_LUMA avx, v, 16 DEBLOCK_LUMA avx, v, 16
%endif %endif
@@ -781,7 +781,7 @@ cglobal deblock_h_luma_intra_8_%1, 2,4


INIT_XMM INIT_XMM
DEBLOCK_LUMA_INTRA sse2, v DEBLOCK_LUMA_INTRA sse2, v
%ifdef HAVE_AVX
%if HAVE_AVX
INIT_AVX INIT_AVX
DEBLOCK_LUMA_INTRA avx , v DEBLOCK_LUMA_INTRA avx , v
%endif %endif


+ 4
- 4
libavcodec/x86/h264_deblock_10bit.asm View File

@@ -419,7 +419,7 @@ cglobal deblock_h_luma_10_%1, 5,7,15


INIT_XMM INIT_XMM
DEBLOCK_LUMA_64 sse2 DEBLOCK_LUMA_64 sse2
%ifdef HAVE_AVX
%if HAVE_AVX
INIT_AVX INIT_AVX
DEBLOCK_LUMA_64 avx DEBLOCK_LUMA_64 avx
%endif %endif
@@ -716,7 +716,7 @@ cglobal deblock_h_luma_intra_10_%1, 4,7,16


INIT_XMM INIT_XMM
DEBLOCK_LUMA_INTRA_64 sse2 DEBLOCK_LUMA_INTRA_64 sse2
%ifdef HAVE_AVX
%if HAVE_AVX
INIT_AVX INIT_AVX
DEBLOCK_LUMA_INTRA_64 avx DEBLOCK_LUMA_INTRA_64 avx
%endif %endif
@@ -803,7 +803,7 @@ DEBLOCK_LUMA_INTRA mmxext
INIT_XMM INIT_XMM
DEBLOCK_LUMA sse2 DEBLOCK_LUMA sse2
DEBLOCK_LUMA_INTRA sse2 DEBLOCK_LUMA_INTRA sse2
%ifdef HAVE_AVX
%if HAVE_AVX
INIT_AVX INIT_AVX
DEBLOCK_LUMA avx DEBLOCK_LUMA avx
DEBLOCK_LUMA_INTRA avx DEBLOCK_LUMA_INTRA avx
@@ -919,7 +919,7 @@ DEBLOCK_CHROMA mmxext
%endif %endif
INIT_XMM INIT_XMM
DEBLOCK_CHROMA sse2 DEBLOCK_CHROMA sse2
%ifdef HAVE_AVX
%if HAVE_AVX
INIT_AVX INIT_AVX
DEBLOCK_CHROMA avx DEBLOCK_CHROMA avx
%endif %endif

+ 2
- 2
libavcodec/x86/imdct36_sse.asm View File

@@ -371,7 +371,7 @@ DEFINE_IMDCT
INIT_XMM ssse3 INIT_XMM ssse3
DEFINE_IMDCT DEFINE_IMDCT


%ifdef HAVE_AVX
%if HAVE_AVX
INIT_XMM avx INIT_XMM avx
DEFINE_IMDCT DEFINE_IMDCT
%endif %endif
@@ -719,7 +719,7 @@ cglobal four_imdct36_float, 5,5,16, out, buf, in, win, tmp
INIT_XMM sse INIT_XMM sse
DEFINE_FOUR_IMDCT DEFINE_FOUR_IMDCT


%ifdef HAVE_AVX
%if HAVE_AVX
INIT_XMM avx INIT_XMM avx
DEFINE_FOUR_IMDCT DEFINE_FOUR_IMDCT
%endif %endif

+ 1
- 1
libavcodec/x86/proresdsp.asm View File

@@ -306,7 +306,7 @@ INIT_XMM
idct_put_fn sse2, 16 idct_put_fn sse2, 16
INIT_XMM INIT_XMM
idct_put_fn sse4, 16 idct_put_fn sse4, 16
%ifdef HAVE_AVX
%if HAVE_AVX
INIT_AVX INIT_AVX
idct_put_fn avx, 16 idct_put_fn avx, 16
%endif %endif


+ 2
- 2
libavcodec/x86/v210.asm View File

@@ -76,14 +76,14 @@ cglobal v210_planar_unpack_%1_%2, 5, 5


INIT_XMM INIT_XMM
v210_planar_unpack unaligned, ssse3 v210_planar_unpack unaligned, ssse3
%ifdef HAVE_AVX
%if HAVE_AVX
INIT_AVX INIT_AVX
v210_planar_unpack unaligned, avx v210_planar_unpack unaligned, avx
%endif %endif


INIT_XMM INIT_XMM
v210_planar_unpack aligned, ssse3 v210_planar_unpack aligned, ssse3
%ifdef HAVE_AVX
%if HAVE_AVX
INIT_AVX INIT_AVX
v210_planar_unpack aligned, avx v210_planar_unpack aligned, avx
%endif %endif

Loading…
Cancel
Save