diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 13:36:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 13:36:39 +0100 |
| commit | 17596198cacbb7277f1d9641f0a76fe62ebf155d (patch) | |
| tree | 1c35aa3df1c1b2b92f942b5f83b3f80ea42d0ad5 /libavutil | |
| parent | a003c5bd4ff1846edba0518306f8091c14041c96 (diff) | |
| parent | 80ac87c13dc8c6c063e26a464c5c542357c0583f (diff) | |
Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'
* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f':
lavc: support ZenoXVID custom tag
libcdio: support recent cdio-paranoia
float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
theora: Skip zero-sized headers
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/float_dsp_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/x86/float_dsp_init.c b/libavutil/x86/float_dsp_init.c index 93cff9f49a..68ddf878c6 100644 --- a/libavutil/x86/float_dsp_init.c +++ b/libavutil/x86/float_dsp_init.c @@ -41,7 +41,7 @@ extern void ff_vector_dmul_scalar_sse2(double *dst, const double *src, extern void ff_vector_dmul_scalar_avx(double *dst, const double *src, double mul, int len); -#if HAVE_6REGS +#if HAVE_6REGS && HAVE_INLINE_ASM static void vector_fmul_window_3dnowext(float *dst, const float *src0, const float *src1, const float *win, int len) @@ -105,13 +105,13 @@ static void vector_fmul_window_sse(float *dst, const float *src0, : "r"(dst + len), "r"(src0 + len), "r"(src1), "r"(win + len) ); } -#endif /* HAVE_6REGS */ +#endif /* HAVE_6REGS && HAVE_INLINE_ASM */ void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp) { int mm_flags = av_get_cpu_flags(); -#if HAVE_6REGS +#if HAVE_6REGS && HAVE_INLINE_ASM if (INLINE_AMD3DNOWEXT(mm_flags)) { fdsp->vector_fmul_window = vector_fmul_window_3dnowext; } |