diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:32:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:32:05 +0200 |
| commit | 477641e9f8a711b65a463ea75a4167b7cfdc84a5 (patch) | |
| tree | 3e9ad5bed88a8aa05f580d5db98dbb226899b184 /libavcodec/dsputil.h | |
| parent | 29daad5b98bc07b9669c22b39113f5568ef1c570 (diff) | |
| parent | a64f6a04ac5773aeff2003897455dadb9609f18b (diff) | |
| download | ffmpeg-477641e9f8a711b65a463ea75a4167b7cfdc84a5.tar.gz | |
Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'
* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
dsputil: x86: Hide arch-specific initialization details
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 4381caa6b4..b9f8bdec0c 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -322,10 +322,10 @@ void ff_set_cmp(DSPContext* c, me_cmp_func *cmp, int type); void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_arm(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx); -void ff_dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); +void ff_dsputil_init_x86(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_dwt(DSPContext *c); |