diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-23 11:01:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-23 11:01:46 +0200 |
| commit | 0a73803c86f6f4e8db379d8514cccdd8a9d7b9ee (patch) | |
| tree | 88c1e1cb1b855c90ec9b128e71ca2a62b80b3eb4 /libavcodec/x86/mpegvideoenc.c | |
| parent | 5056cff12597d57fe9a6bd327aee63de8b1f7ce3 (diff) | |
| parent | c1ad70c3cb0588254d66265578cfb14580dc0b94 (diff) | |
| download | ffmpeg-0a73803c86f6f4e8db379d8514cccdd8a9d7b9ee.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Move some conditional code around to avoid unused variable warnings
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/mpegvideoenc.c')
| -rw-r--r-- | libavcodec/x86/mpegvideoenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c index 6219667af3..eda0b76957 100644 --- a/libavcodec/x86/mpegvideoenc.c +++ b/libavcodec/x86/mpegvideoenc.c @@ -83,11 +83,11 @@ extern uint16_t ff_inv_zigzag_direct16[64]; av_cold void ff_dct_encode_init_x86(MpegEncContext *s) { - int mm_flags = av_get_cpu_flags(); const int dct_algo = s->avctx->dct_algo; if (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX) { #if HAVE_MMX_INLINE + int mm_flags = av_get_cpu_flags(); if (INLINE_MMX(mm_flags)) s->dct_quantize = dct_quantize_MMX; #endif |