diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-25 16:55:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-25 16:55:31 +0200 |
| commit | a6ff8514a9bdc93739a73d28913c6b457baff32d (patch) | |
| tree | ed4f3c885586b33b7d8229e606acc80cd8c8ca50 /libavcodec/x86/lpc_mmx.c | |
| parent | fec512a52cdd1bab84958474cc160fdb7be81dec (diff) | |
| parent | dc5385806339f90b4eb074d9002205ebb4010cc2 (diff) | |
| download | ffmpeg-a6ff8514a9bdc93739a73d28913c6b457baff32d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wtv: Check the return value from gmtime
x86: fft: convert sse inline asm to yasm
x86: place some inline asm under #if HAVE_INLINE_ASM
Conflicts:
libavcodec/x86/fft_sse.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/lpc_mmx.c')
| -rw-r--r-- | libavcodec/x86/lpc_mmx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/x86/lpc_mmx.c b/libavcodec/x86/lpc_mmx.c index 1c202e2ccc..087a324a43 100644 --- a/libavcodec/x86/lpc_mmx.c +++ b/libavcodec/x86/lpc_mmx.c @@ -23,6 +23,8 @@ #include "libavutil/cpu.h" #include "libavcodec/lpc.h" +#if HAVE_INLINE_ASM + static void lpc_apply_welch_window_sse2(const int32_t *data, int len, double *w_data) { @@ -136,12 +138,16 @@ static void lpc_compute_autocorr_sse2(const double *data, int len, int lag, } } +#endif /* HAVE_INLINE_ASM */ + av_cold void ff_lpc_init_x86(LPCContext *c) { 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 */ } |