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/mpegvideo.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/mpegvideo.c')
| -rw-r--r-- | libavcodec/x86/mpegvideo.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/x86/mpegvideo.c b/libavcodec/x86/mpegvideo.c index 59db401f03..cee3d5f7df 100644 --- a/libavcodec/x86/mpegvideo.c +++ b/libavcodec/x86/mpegvideo.c @@ -568,11 +568,10 @@ av_cold void ff_MPV_common_init_x86(MpegEncContext *s) if(!(s->flags & CODEC_FLAG_BITEXACT)) s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_mmx; s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_mmx; - if (INLINE_SSE2(cpu_flags)) { - s->denoise_dct= denoise_dct_sse2; - } else { - s->denoise_dct= denoise_dct_mmx; - } + s->denoise_dct = denoise_dct_mmx; + } + if (INLINE_SSE2(cpu_flags)) { + s->denoise_dct = denoise_dct_sse2; } #endif /* HAVE_MMX_INLINE */ } |