summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-02-27 14:49:52 -0800
committerDiego Biurrun <diego@biurrun.de>2014-02-28 10:34:55 +0100
commitb23650491fbd579a4365f42bd42575afb7b53f7e (patch)
tree601a0384b969f7640d029a470901e3ab4023d6c0
parentf2408ec9d752aa6ceb7eb9edb2771eafba437c1b (diff)
prores: Use consistent names for DSP arch initialization functions
-rw-r--r--libavcodec/proresdsp.c3
-rw-r--r--libavcodec/proresdsp.h2
-rw-r--r--libavcodec/x86/proresdsp_init.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c
index 1c0f391576..ac05d6176d 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 5e35140b53..21d12e8814 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 d63382c554..68ad929067 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();