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/proresdsp.h | |
| 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/proresdsp.h')
| -rw-r--r-- | libavcodec/proresdsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |