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/x86/dsputil_init.c | |
| 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/x86/dsputil_init.c')
| -rw-r--r-- | libavcodec/x86/dsputil_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index 166be65aac..86e2fd3661 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -672,7 +672,7 @@ static av_cold void dsputil_init_sse4(DSPContext *c, AVCodecContext *avctx, #endif /* HAVE_SSE4_EXTERNAL */ } -av_cold void ff_dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx) +av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); |