Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 19:41:08 +0000 (20:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 19:41:08 +0000 (20:41 +0100)
* qatar/master:
  x86: dsputil: Simplify xvmc deprecation conditional

Conflicts:
libavcodec/x86/dsputil_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/dsputil_init.c

@@@ -582,22 -593,21 +583,23 @@@ static av_cold void dsputil_init_sse(DS
  #if HAVE_SSE_INLINE
      const int high_bit_depth = avctx->bits_per_raw_sample > 8;
  
 -#if FF_API_XVMC
 -FF_DISABLE_DEPRECATION_WARNINGS
+     c->vector_clipf = ff_vector_clipf_sse;
 -    if (CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1)
+     /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */
 -FF_ENABLE_DEPRECATION_WARNINGS
 -#endif /* FF_API_XVMC */
++    if (CONFIG_XVMC && avctx->hwaccel && avctx->hwaccel->decode_mb)
+         return;
      if (!high_bit_depth) {
-         if (!(CONFIG_XVMC && avctx->hwaccel && avctx->hwaccel->decode_mb)) {
-             /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */
          c->clear_block  = ff_clear_block_sse;
          c->clear_blocks = ff_clear_blocks_sse;
-         }
      }
-     c->vector_clipf = ff_vector_clipf_sse;
  #endif /* HAVE_SSE_INLINE */
 +
 +#if HAVE_YASM
 +#if HAVE_INLINE_ASM && CONFIG_VIDEODSP
 +    c->gmc = ff_gmc_sse;
 +#endif
 +#endif /* HAVE_YASM */
  }
  
  static av_cold void dsputil_init_sse2(DSPContext *c, AVCodecContext *avctx,