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/dsputilenc_mmx.c | |
| parent | 5056cff12597d57fe9a6bd327aee63de8b1f7ce3 (diff) | |
| parent | c1ad70c3cb0588254d66265578cfb14580dc0b94 (diff) | |
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/dsputilenc_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 06186e2fde..49e30194ec 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -947,9 +947,10 @@ hadamard_func(ssse3) av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx) { int mm_flags = av_get_cpu_flags(); - int bit_depth = avctx->bits_per_raw_sample; #if HAVE_YASM + int bit_depth = avctx->bits_per_raw_sample; + if (EXTERNAL_MMX(mm_flags)) { if (bit_depth <= 8) c->get_pixels = ff_get_pixels_mmx; |