[FFmpeg-cvslog] Fix compilation with YASM/NASM without AVX support.

Reimar Döffinger git at videolan.org
Tue May 1 22:19:19 CEST 2012


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sat Apr 28 12:51:06 2012 +0200| [e5b7d7773a07dd80909402939b8f6812cfded903] | committer: Justin Ruggles

Fix compilation with YASM/NASM without AVX support.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Signed-off-by: Justin Ruggles <justin.ruggles at gmail.com>

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

 libavresample/x86/audio_mix.asm |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavresample/x86/audio_mix.asm b/libavresample/x86/audio_mix.asm
index ef30f02..dbc79e5 100644
--- a/libavresample/x86/audio_mix.asm
+++ b/libavresample/x86/audio_mix.asm
@@ -60,5 +60,7 @@ cglobal mix_2_to_1_fltp_flt, 3,4,6, src, matrix, len, src1
 
 INIT_XMM sse
 MIX_2_TO_1_FLTP_FLT
+%if HAVE_AVX
 INIT_YMM avx
 MIX_2_TO_1_FLTP_FLT
+%endif



More information about the ffmpeg-cvslog mailing list