diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 23:38:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 23:38:41 +0200 |
| commit | 34b78ad04fe3b46a4658f011c776550110be7dc0 (patch) | |
| tree | a92b5e50c4392c23203621c57f90edd1727670d5 | |
| parent | ed3680bc9b8f7458ed62d252e2da0e141faa0377 (diff) | |
| parent | a3cb865310cc10927e90d7b44d65e3a95af547b6 (diff) | |
| download | ffmpeg-34b78ad04fe3b46a4658f011c776550110be7dc0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Move some ifdefs to avoid unused variable warnings
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 68042bc08b..cc74c83af5 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -1482,9 +1482,9 @@ static av_cold void dsputil_init_mmxext(DSPContext *c, AVCodecContext *avctx, static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, int mm_flags) { +#if HAVE_INLINE_ASM const int high_bit_depth = avctx->bits_per_raw_sample > 8; -#if HAVE_INLINE_ASM if (!high_bit_depth) { if (!(CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)) { /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */ |