[SCM] libav/experimental: prores: Use consistent names for DSP arch initialization functions

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b23650491fbd579a4365f42bd42575afb7b53f7e
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Feb 27 14:49:52 2014 -0800

    prores: Use consistent names for DSP arch initialization functions

diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c
index 1c0f391..ac05d61 100644
--- a/libavcodec/proresdsp.c
+++ b/libavcodec/proresdsp.c
@@ -78,7 +78,8 @@ av_cold void ff_proresdsp_init(ProresDSPContext *dsp)
     dsp->idct_put = prores_idct_put_c;
     dsp->idct_permutation_type = FF_NO_IDCT_PERM;
 
-    if (ARCH_X86) ff_proresdsp_x86_init(dsp);
+    if (ARCH_X86)
+        ff_proresdsp_init_x86(dsp);
 
     ff_init_scantable_permutation(dsp->idct_permutation,
                                   dsp->idct_permutation_type);
diff --git a/libavcodec/proresdsp.h b/libavcodec/proresdsp.h
index 5e35140..21d12e8 100644
--- a/libavcodec/proresdsp.h
+++ b/libavcodec/proresdsp.h
@@ -38,6 +38,6 @@ typedef struct ProresDSPContext {
 
 void ff_proresdsp_init(ProresDSPContext *dsp);
 
-void ff_proresdsp_x86_init(ProresDSPContext *dsp);
+void ff_proresdsp_init_x86(ProresDSPContext *dsp);
 
 #endif /* AVCODEC_PRORESDSP_H */
diff --git a/libavcodec/x86/proresdsp_init.c b/libavcodec/x86/proresdsp_init.c
index d63382c..68ad929 100644
--- a/libavcodec/x86/proresdsp_init.c
+++ b/libavcodec/x86/proresdsp_init.c
@@ -32,7 +32,7 @@ void ff_prores_idct_put_10_sse4(uint16_t *dst, int linesize,
 void ff_prores_idct_put_10_avx (uint16_t *dst, int linesize,
                                 int16_t *block, const int16_t *qmat);
 
-av_cold void ff_proresdsp_x86_init(ProresDSPContext *dsp)
+av_cold void ff_proresdsp_init_x86(ProresDSPContext *dsp)
 {
 #if ARCH_X86_64
     int cpu_flags = av_get_cpu_flags();

-- 
Libav/FFmpeg packaging