Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 23:17:39 +0000 (01:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 23:17:39 +0000 (01:17 +0200)
* commit '391ecc961ced2bde7aecb3053ac35191f838fae8':
  x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase

Conflicts:
libavcodec/x86/mpegvideoenc.c

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

@@@ -209,27 -205,23 +209,27 @@@ av_cold void ff_dct_encode_init_x86(Mpe
  #if HAVE_MMX_INLINE
          int cpu_flags = av_get_cpu_flags();
          if (INLINE_MMX(cpu_flags)) {
-             s->dct_quantize = dct_quantize_MMX;
 +#if HAVE_6REGS
+             s->dct_quantize = dct_quantize_mmx;
 +#endif
              s->denoise_dct  = denoise_dct_mmx;
          }
  #endif
 -#if HAVE_MMXEXT_INLINE
 +#if HAVE_6REGS && HAVE_MMXEXT_INLINE
          if (INLINE_MMXEXT(cpu_flags))
-             s->dct_quantize = dct_quantize_MMXEXT;
+             s->dct_quantize = dct_quantize_mmxext;
  #endif
  #if HAVE_SSE2_INLINE
          if (INLINE_SSE2(cpu_flags)) {
-             s->dct_quantize = dct_quantize_SSE2;
 +#if HAVE_6REGS
+             s->dct_quantize = dct_quantize_sse2;
 +#endif
              s->denoise_dct  = denoise_dct_sse2;
          }
  #endif
 -#if HAVE_SSSE3_INLINE
 +#if HAVE_6REGS && HAVE_SSSE3_INLINE
          if (INLINE_SSSE3(cpu_flags))
-             s->dct_quantize = dct_quantize_SSSE3;
+             s->dct_quantize = dct_quantize_ssse3;
  #endif
      }
  }
@@@ -106,10 -106,10 +106,10 @@@ static int RENAME(dct_quantize)(MpegEnc
      const uint16_t *qmat, *bias;
      LOCAL_ALIGNED_16(int16_t, temp_block, [64]);
  
 -    assert((7&(int)(&temp_block[0])) == 0); //did gcc align it correctly?
 +    av_assert2((7&(int)(&temp_block[0])) == 0); //did gcc align it correctly?
  
      //s->fdct (block);
-     RENAMEl(ff_fdct) (block); //cannot be anything else ...
+     RENAME_FDCT(ff_fdct)(block); // cannot be anything else ...
  
      if(s->dct_error_sum)
          s->denoise_dct(s, block);