mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
Fix compilation without HAVE_AVX.
%ifdef HAVE_AVX must now be %if HAVE_AVX. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
parent
18a7f7465e
commit
f51a072160
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user