diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 14:07:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-20 14:13:16 +0100 |
| commit | c62cb1112ffc32492c99aa1e94324fc6a951abe9 (patch) | |
| tree | 4ed9a1feb6ea8db5b431487e6618d1015e84eb9a /libavcodec/x86/Makefile | |
| parent | cf061a9c3b861a048dd5b67ded5265c6f53805e5 (diff) | |
| parent | fef906c77c09940a2fdad155b2adc05080e17eda (diff) | |
| download | ffmpeg-c62cb1112ffc32492c99aa1e94324fc6a951abe9.tar.gz | |
Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'
* commit 'fef906c77c09940a2fdad155b2adc05080e17eda':
Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.
Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/Makefile')
| -rw-r--r-- | libavcodec/x86/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index c596ae7bc7..b0f50aaf65 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -23,6 +23,7 @@ OBJS-$(CONFIG_V210_DECODER) += x86/v210-init.o OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_init.o OBJS-$(CONFIG_VIDEODSP) += x86/videodsp_init.o +OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp_init.o OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp_init.o OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o |