diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 21:09:30 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 21:09:30 +0200 |
commit | b3b05a11d31d544025c0400a1c6bc70124300a86 (patch) | |
tree | 66dd99b2b70d25bcb2319225f6a710710f29205f /libavcodec/x86/Makefile | |
parent | 3ff5ca89fc8783cabed56887f556bdd83279ffb0 (diff) | |
parent | dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5 (diff) | |
download | ffmpeg-streaming-b3b05a11d31d544025c0400a1c6bc70124300a86.zip ffmpeg-streaming-b3b05a11d31d544025c0400a1c6bc70124300a86.tar.gz |
Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'
* commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5':
cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs
Conflicts:
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/dct-test.c
libavcodec/x86/xvididct_sse2.c
libavcodec/xvididct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/Makefile')
-rw-r--r-- | libavcodec/x86/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index fbb9abf..7bf0e82 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -70,8 +70,8 @@ MMX-OBJS-$(CONFIG_IDCTDSP) += x86/idctdsp_mmx.o \ x86/simple_idct.o # decoders/encoders -MMX-OBJS-$(CONFIG_MPEG4_DECODER) += x86/idct_mmx_xvid.o \ - x86/idct_sse2_xvid.o +MMX-OBJS-$(CONFIG_MPEG4_DECODER) += x86/xvididct_mmx.o \ + x86/xvididct_sse2.o MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp.o MMX-OBJS-$(CONFIG_SNOW_ENCODER) += x86/snowdsp.o MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o |