diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 12:49:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 12:50:01 +0200 |
| commit | 62a6052974d89e5463f21930d46c69fab3f0d804 (patch) | |
| tree | 864406a6240c60572f70c3bff4e941cb013f5729 /libavcodec/x86/mpegaudiodsp.c | |
| parent | 7fb758cd8ed08e4a37f10e25003953d13c68b8cd (diff) | |
| parent | e998b56362c711701b3daa34e7b956e7126336f4 (diff) | |
Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4'
* commit 'e998b56362c711701b3daa34e7b956e7126336f4':
x86: avcodec: Consistently structure CPU extension initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/mpegaudiodsp.c')
| -rw-r--r-- | libavcodec/x86/mpegaudiodsp.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c index ea070f6da3..9c6f7950a5 100644 --- a/libavcodec/x86/mpegaudiodsp.c +++ b/libavcodec/x86/mpegaudiodsp.c @@ -258,16 +258,20 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s) #endif /* HAVE_SSE2_INLINE */ #if HAVE_YASM + if (EXTERNAL_SSE(cpu_flags)) { + s->imdct36_blocks_float = imdct36_blocks_sse; + } + if (EXTERNAL_SSE2(cpu_flags)) { + s->imdct36_blocks_float = imdct36_blocks_sse2; + } + if (EXTERNAL_SSE3(cpu_flags)) { + s->imdct36_blocks_float = imdct36_blocks_sse3; + } + if (EXTERNAL_SSSE3(cpu_flags)) { + s->imdct36_blocks_float = imdct36_blocks_ssse3; + } if (EXTERNAL_AVX(cpu_flags)) { s->imdct36_blocks_float = imdct36_blocks_avx; - } else if (EXTERNAL_SSSE3(cpu_flags)) { - s->imdct36_blocks_float = imdct36_blocks_ssse3; - } else if (EXTERNAL_SSE3(cpu_flags)) { - s->imdct36_blocks_float = imdct36_blocks_sse3; - } else if (EXTERNAL_SSE2(cpu_flags)) { - s->imdct36_blocks_float = imdct36_blocks_sse2; - } else if (EXTERNAL_SSE(cpu_flags)) { - s->imdct36_blocks_float = imdct36_blocks_sse; } #endif /* HAVE_YASM */ } |