[SCM] libav/experimental: x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 391ecc961ced2bde7aecb3053ac35191f838fae8
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Dec 30 17:06:45 2013 +0100

    x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase

diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c
index 78313f4..2e4f06c 100644
--- a/libavcodec/x86/mpegvideoenc.c
+++ b/libavcodec/x86/mpegvideoenc.c
@@ -34,8 +34,8 @@ DECLARE_ALIGNED(16, static uint16_t, inv_zigzag_direct16)[64];
 #define COMPILE_TEMPLATE_MMXEXT 0
 #define COMPILE_TEMPLATE_SSE2   0
 #define COMPILE_TEMPLATE_SSSE3  0
-#define RENAME(a) a ## _MMX
-#define RENAMEl(a) a ## _mmx
+#define RENAME(a)      a ## _mmx
+#define RENAME_FDCT(a) a ## _mmx
 #include "mpegvideoenc_template.c"
 #endif /* HAVE_MMX_INLINE */
 
@@ -47,9 +47,9 @@ DECLARE_ALIGNED(16, static uint16_t, inv_zigzag_direct16)[64];
 #define COMPILE_TEMPLATE_SSE2   0
 #define COMPILE_TEMPLATE_SSSE3  0
 #undef RENAME
-#undef RENAMEl
-#define RENAME(a) a ## _MMXEXT
-#define RENAMEl(a) a ## _mmxext
+#undef RENAME_FDCT
+#define RENAME(a)      a ## _mmxext
+#define RENAME_FDCT(a) a ## _mmxext
 #include "mpegvideoenc_template.c"
 #endif /* HAVE_MMXEXT_INLINE */
 
@@ -61,9 +61,9 @@ DECLARE_ALIGNED(16, static uint16_t, inv_zigzag_direct16)[64];
 #define COMPILE_TEMPLATE_SSE2   1
 #define COMPILE_TEMPLATE_SSSE3  0
 #undef RENAME
-#undef RENAMEl
-#define RENAME(a) a ## _SSE2
-#define RENAMEl(a) a ## _sse2
+#undef RENAME_FDCT
+#define RENAME(a)      a ## _sse2
+#define RENAME_FDCT(a) a ## _sse2
 #include "mpegvideoenc_template.c"
 #endif /* HAVE_SSE2_INLINE */
 
@@ -75,9 +75,9 @@ DECLARE_ALIGNED(16, static uint16_t, inv_zigzag_direct16)[64];
 #define COMPILE_TEMPLATE_SSE2   1
 #define COMPILE_TEMPLATE_SSSE3  1
 #undef RENAME
-#undef RENAMEl
-#define RENAME(a) a ## _SSSE3
-#define RENAMEl(a) a ## _sse2
+#undef RENAME_FDCT
+#define RENAME(a)      a ## _ssse3
+#define RENAME_FDCT(a) a ## _sse2
 #include "mpegvideoenc_template.c"
 #endif /* HAVE_SSSE3_INLINE */
 
@@ -205,23 +205,23 @@ av_cold void ff_MPV_encode_init_x86(MpegEncContext *s)
 #if HAVE_MMX_INLINE
         int cpu_flags = av_get_cpu_flags();
         if (INLINE_MMX(cpu_flags)) {
-            s->dct_quantize = dct_quantize_MMX;
+            s->dct_quantize = dct_quantize_mmx;
             s->denoise_dct  = denoise_dct_mmx;
         }
 #endif
 #if 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;
+            s->dct_quantize = dct_quantize_sse2;
             s->denoise_dct  = denoise_dct_sse2;
         }
 #endif
 #if HAVE_SSSE3_INLINE
         if (INLINE_SSSE3(cpu_flags))
-            s->dct_quantize = dct_quantize_SSSE3;
+            s->dct_quantize = dct_quantize_ssse3;
 #endif
     }
 }
diff --git a/libavcodec/x86/mpegvideoenc_template.c b/libavcodec/x86/mpegvideoenc_template.c
index fa59006..4a17ff3 100644
--- a/libavcodec/x86/mpegvideoenc_template.c
+++ b/libavcodec/x86/mpegvideoenc_template.c
@@ -109,7 +109,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
     assert((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);

-- 
Libav/FFmpeg packaging