diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 17:13:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 17:13:00 +0100 |
| commit | 5ba1648318161b394499a04e8fc7385ee2fbf375 (patch) | |
| tree | 19c4440ff815dcd4873464b182d803813c2aa0a7 /libavcodec | |
| parent | f3eef02746ef9585400f58de7803c2db7efd7b4a (diff) | |
| parent | b23650491fbd579a4365f42bd42575afb7b53f7e (diff) | |
| download | ffmpeg-5ba1648318161b394499a04e8fc7385ee2fbf375.tar.gz | |
Merge commit 'b23650491fbd579a4365f42bd42575afb7b53f7e'
* commit 'b23650491fbd579a4365f42bd42575afb7b53f7e':
prores: Use consistent names for DSP arch initialization functions
Conflicts:
libavcodec/proresdsp.c
libavcodec/proresdsp.h
libavcodec/x86/proresdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/proresdsp.c | 3 | ||||
| -rw-r--r-- | libavcodec/proresdsp.h | 2 | ||||
| -rw-r--r-- | libavcodec/x86/proresdsp_init.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index ef252dcfee..99f259bc8a 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -78,7 +78,8 @@ av_cold void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) dsp->idct_put = prores_idct_put_c; dsp->idct_permutation_type = FF_NO_IDCT_PERM; - if (ARCH_X86) ff_proresdsp_x86_init(dsp, avctx); + if (ARCH_X86) + ff_proresdsp_init_x86(dsp, avctx); ff_init_scantable_permutation(dsp->idct_permutation, dsp->idct_permutation_type); diff --git a/libavcodec/proresdsp.h b/libavcodec/proresdsp.h index 706162af52..733d474c4d 100644 --- a/libavcodec/proresdsp.h +++ b/libavcodec/proresdsp.h @@ -39,6 +39,6 @@ typedef struct ProresDSPContext { void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx); -void ff_proresdsp_x86_init(ProresDSPContext *dsp, AVCodecContext *avctx); +void ff_proresdsp_init_x86(ProresDSPContext *dsp, AVCodecContext *avctx); #endif /* AVCODEC_PRORESDSP_H */ diff --git a/libavcodec/x86/proresdsp_init.c b/libavcodec/x86/proresdsp_init.c index fa4a2d48e3..394025b68e 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, AVCodecContext *avctx) +av_cold void ff_proresdsp_init_x86(ProresDSPContext *dsp, AVCodecContext *avctx) { #if ARCH_X86_64 int cpu_flags = av_get_cpu_flags(); |