From b23650491fbd579a4365f42bd42575afb7b53f7e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 27 Feb 2014 14:49:52 -0800 Subject: prores: Use consistent names for DSP arch initialization functions --- libavcodec/proresdsp.c | 3 ++- libavcodec/proresdsp.h | 2 +- libavcodec/x86/proresdsp_init.c | 2 +- 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(); -- cgit v1.2.3