diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-08 12:53:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-08 12:53:44 +0200 |
| commit | 7beadfe1f7777574e99fd4cf6bcd7abad4fb4089 (patch) | |
| tree | 48b177a5d395f894b8ad8b99086cecf4271aedb5 /libavcodec/x86/lpc.c | |
| parent | 8a0118b4b49460fb2d33b3fac765c7131816ecc7 (diff) | |
| parent | 7b699d813681e4fad419ec63c96d595e98b2dbfa (diff) | |
| download | ffmpeg-7beadfe1f7777574e99fd4cf6bcd7abad4fb4089.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov_chan: Only set the channel_layout if setting it to a nonzero value
mov_chan: Reindent an incorrectly indented line
mp2 muxer: mark as AVFMT_NOTIMESTAMPS.
x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64
x86: more specific checks for availability of required assembly capabilities
x86: avcodec: Drop silly "_mmx" suffix from dsputil template names
fate: Drop redundant setting of FUZZ to 1
cavsdsp: set idct permutation independently of dsputil
x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/lpc.c')
| -rw-r--r-- | libavcodec/x86/lpc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/lpc.c b/libavcodec/x86/lpc.c index e0e6f8ba8a..a66f1e0da0 100644 --- a/libavcodec/x86/lpc.c +++ b/libavcodec/x86/lpc.c @@ -23,7 +23,7 @@ #include "libavutil/cpu.h" #include "libavcodec/lpc.h" -#if HAVE_INLINE_ASM +#if HAVE_SSE2_INLINE static void lpc_apply_welch_window_sse2(const int32_t *data, int len, double *w_data) @@ -138,16 +138,16 @@ static void lpc_compute_autocorr_sse2(const double *data, int len, int lag, } } -#endif /* HAVE_INLINE_ASM */ +#endif /* HAVE_SSE2_INLINE */ av_cold void ff_lpc_init_x86(LPCContext *c) { +#if HAVE_SSE2_INLINE int mm_flags = av_get_cpu_flags(); -#if HAVE_INLINE_ASM if (mm_flags & (AV_CPU_FLAG_SSE2|AV_CPU_FLAG_SSE2SLOW)) { c->lpc_apply_welch_window = lpc_apply_welch_window_sse2; c->lpc_compute_autocorr = lpc_compute_autocorr_sse2; } -#endif /* HAVE_INLINE_ASM */ +#endif /* HAVE_SSE2_INLINE */ } |