diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 13:10:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 13:10:53 +0200 |
| commit | 9d47333e3eee1d9a31a98ebf67338463943846dc (patch) | |
| tree | 4e850a0a6195c3f17e2366e3b760c59fbafe1bbe | |
| parent | 50617fce073ca3e360388b38a83341e37db92b80 (diff) | |
| parent | 2b379a925162b6783bd9a81dc03e647e8b65494c (diff) | |
| download | ffmpeg-9d47333e3eee1d9a31a98ebf67338463943846dc.tar.gz | |
Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'
* commit '2b379a925162b6783bd9a81dc03e647e8b65494c':
mlpdsp: x86: Respect cpuflags
Conflicts:
libavcodec/x86/mlpdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/mlpdsp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/x86/mlpdsp.c b/libavcodec/x86/mlpdsp.c index 81cab5a5e9..94849b7e79 100644 --- a/libavcodec/x86/mlpdsp.c +++ b/libavcodec/x86/mlpdsp.c @@ -20,7 +20,9 @@ */ #include "libavutil/attributes.h" +#include "libavutil/cpu.h" #include "libavutil/x86/asm.h" +#include "libavutil/x86/cpu.h" #include "libavcodec/mlpdsp.h" #include "libavcodec/mlp.h" @@ -177,6 +179,8 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, av_cold void ff_mlpdsp_init_x86(MLPDSPContext *c) { #if HAVE_7REGS && HAVE_INLINE_ASM - c->mlp_filter_channel = mlp_filter_channel_x86; + int cpu_flags = av_get_cpu_flags(); + if (INLINE_MMX(cpu_flags)) + c->mlp_filter_channel = mlp_filter_channel_x86; #endif } |