Merge commit '976f2e0a542e47aaf68ddbe001fb70a00bf96d99' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:20:25 +0000 (19:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:20:25 +0000 (19:20 +0200)
* commit '976f2e0a542e47aaf68ddbe001fb70a00bf96d99':
  x86: Fix linking with some or all of yasm, mmx, optimizations disabled

Conflicts:
libavcodec/x86/mpegaudiodec_mmx.c

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

@@@ -192,17 -193,12 +193,16 @@@ static void imdct36_blocks_ ## CPU1(flo
      }                                                                   \
  }
  
- #if HAVE_YASM
 +#if HAVE_SSE
  DECL_IMDCT_BLOCKS(sse,sse)
  DECL_IMDCT_BLOCKS(sse2,sse)
  DECL_IMDCT_BLOCKS(sse3,sse)
  DECL_IMDCT_BLOCKS(ssse3,sse)
 +#endif
 +#if HAVE_AVX
  DECL_IMDCT_BLOCKS(avx,avx)
- #endif
 +#endif
+ #endif /* HAVE_YASM */
  
  void ff_mpadsp_init_mmx(MPADSPContext *s)
  {