wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compilation with yasm-0.6.2

Browse source
This commit is contained in:
Carl Eugen Hoyos 2012-01-12 16:35:49 +01:00
parent 05577aafaa
commit ef3a19d595
7 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libavcodec/x86/imdct36_sse.asm
View file

@ -371,8 +371,10 @@ DEFINE_IMDCT
INIT_XMM ssse3
DEFINE_IMDCT
%ifdef HAVE_AVX
INIT_XMM avx
DEFINE_IMDCT
%endif
INIT_XMM sse
@ -717,5 +719,7 @@ cglobal four_imdct36_float, 5,5,8, out, buf, in, win, tmp
INIT_XMM sse
DEFINE_FOUR_IMDCT
%ifdef HAVE_AVX
INIT_XMM avx
DEFINE_FOUR_IMDCT
%endif

2
libavcodec/x86/proresdsp.asm
View file

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

4
libavcodec/x86/v210-init.c
View file

@ -34,14 +34,14 @@ av_cold void v210_x86_init(V210DecContext *s)
if (cpu_flags & AV_CPU_FLAG_SSSE3)
s->unpack_frame = ff_v210_planar_unpack_aligned_ssse3;
if (cpu_flags & AV_CPU_FLAG_AVX)
if (HAVE_AVX && cpu_flags & AV_CPU_FLAG_AVX)
s->unpack_frame = ff_v210_planar_unpack_aligned_avx;
}
else {
if (cpu_flags & AV_CPU_FLAG_SSSE3)
s->unpack_frame = ff_v210_planar_unpack_unaligned_ssse3;
if (cpu_flags & AV_CPU_FLAG_AVX)
if (HAVE_AVX && cpu_flags & AV_CPU_FLAG_AVX)
s->unpack_frame = ff_v210_planar_unpack_unaligned_avx;
}
#endif

4
libavcodec/x86/v210.asm
View file

@ -76,10 +76,14 @@ cglobal v210_planar_unpack_%1_%2, 5, 5
INIT_XMM
v210_planar_unpack unaligned, ssse3
%ifdef HAVE_AVX
INIT_AVX
v210_planar_unpack unaligned, avx
%endif
INIT_XMM
v210_planar_unpack aligned, ssse3
%ifdef HAVE_AVX
INIT_AVX
v210_planar_unpack aligned, avx
%endif