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.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/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index b434589fe0..fe2df12c49 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2915,7 +2915,7 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) } - if (HAVE_MMX) ff_dsputil_init_mmx (c, avctx); + if (ARCH_X86) ff_dsputil_init_x86 (c, avctx); if (ARCH_ARM) ff_dsputil_init_arm (c, avctx); if (HAVE_VIS) ff_dsputil_init_vis (c, avctx); if (ARCH_ALPHA) ff_dsputil_init_alpha (c, avctx); |