eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 18:40:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation with yasm-0.6.2.

Browse Source
This commit is contained in:
Carl Eugen Hoyos
2012-01-12 16:53:42 +01:00
parent 601e648458
commit ad6eefc0d8
6 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/x86/imdct36_sse.asm
View File

@@ -357,5 +357,7 @@ DEFINE_IMDCT ssse3
%define BUILDINVHIGHLOW BUILDINVHIGHLOW_AVX %define BUILDINVHIGHLOW BUILDINVHIGHLOW_AVX
%define PSHUFD PSHUFD_SSE_AVX %define PSHUFD PSHUFD_SSE_AVX
%ifdef HAVE_AVX
INIT_AVX INIT_AVX
DEFINE_IMDCT avx DEFINE_IMDCT avx
%endif

2
libavcodec/x86/proresdsp.asm
View File

@@ -306,7 +306,9 @@ 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
INIT_AVX INIT_AVX
idct_put_fn avx, 16 idct_put_fn avx, 16
%endif
%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) if (cpu_flags & AV_CPU_FLAG_SSSE3)
s->unpack_frame = ff_v210_planar_unpack_aligned_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; s->unpack_frame = ff_v210_planar_unpack_aligned_avx;
} }
else { else {
if (cpu_flags & AV_CPU_FLAG_SSSE3) if (cpu_flags & AV_CPU_FLAG_SSSE3)
s->unpack_frame = ff_v210_planar_unpack_unaligned_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; s->unpack_frame = ff_v210_planar_unpack_unaligned_avx;
} }
#endif #endif

4
libavcodec/x86/v210.asm
View File

@@ -76,10 +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
INIT_AVX INIT_AVX
v210_planar_unpack unaligned, avx v210_planar_unpack unaligned, avx
%endif
INIT_XMM INIT_XMM
v210_planar_unpack aligned, ssse3 v210_planar_unpack aligned, ssse3
%ifdef HAVE_AVX
INIT_AVX INIT_AVX
v210_planar_unpack aligned, avx v210_planar_unpack aligned, avx
%endif

4
libswscale/x86/scale.asm
View File

@@ -667,10 +667,12 @@ yuv2planeX_fn sse4, 9, 7, 5
yuv2planeX_fn sse4, 10, 7, 5 yuv2planeX_fn sse4, 10, 7, 5
yuv2planeX_fn sse4, 16, 8, 5 yuv2planeX_fn sse4, 16, 8, 5
%ifdef HAVE_AVX
INIT_AVX INIT_AVX
yuv2planeX_fn avx, 8, 10, 7 yuv2planeX_fn avx, 8, 10, 7
yuv2planeX_fn avx, 9, 7, 5 yuv2planeX_fn avx, 9, 7, 5
yuv2planeX_fn avx, 10, 7, 5 yuv2planeX_fn avx, 10, 7, 5
%endif
; %1=outout-bpc, %2=alignment (u/a) ; %1=outout-bpc, %2=alignment (u/a)
%macro yuv2plane1_mainloop 2 %macro yuv2plane1_mainloop 2
@@ -804,8 +806,10 @@ yuv2plane1_fn 16, 6, 3
INIT_XMM sse4 INIT_XMM sse4
yuv2plane1_fn 16, 5, 3 yuv2plane1_fn 16, 5, 3
%ifdef HAVE_AVX
INIT_XMM avx INIT_XMM avx
yuv2plane1_fn 8, 5, 5 yuv2plane1_fn 8, 5, 5
yuv2plane1_fn 9, 5, 3 yuv2plane1_fn 9, 5, 3
yuv2plane1_fn 10, 5, 3 yuv2plane1_fn 10, 5, 3
yuv2plane1_fn 16, 5, 3 yuv2plane1_fn 16, 5, 3
%endif

2
libswscale/x86/swscale_mmx.c
View File

@@ -397,7 +397,7 @@ switch(c->dstBpc){ \
c->yuv2plane1 = ff_yuv2plane1_16_sse4; c->yuv2plane1 = ff_yuv2plane1_16_sse4;
} }
if (cpu_flags & AV_CPU_FLAG_AVX) { if (HAVE_AVX && cpu_flags & AV_CPU_FLAG_AVX) {
ASSIGN_VSCALEX_FUNC(c->yuv2planeX, avx, avx, 1,); ASSIGN_VSCALEX_FUNC(c->yuv2planeX, avx, avx, 1,);
ASSIGN_VSCALE_FUNC(c->yuv2plane1, avx, avx, 1); ASSIGN_VSCALE_FUNC(c->yuv2plane1, avx, avx, 1);
} }