diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 12:30:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 12:32:29 +0200 |
| commit | 742c392885b907f4f1cf092d3e62f82b4551abf3 (patch) | |
| tree | d35b00e094492e6ec9408b5583657a408376bafa /libavcodec/Makefile | |
| parent | 65120f628ca5facb8ae5e14d923ed31218bc9409 (diff) | |
| parent | b93b27edb0455287f49182fbf11b68e575f59225 (diff) | |
| download | ffmpeg-742c392885b907f4f1cf092d3e62f82b4551abf3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: Make dsputil selectable
Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile
libavcodec/x86/constants.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fcb006a1db..f65e0e9e45 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -38,9 +38,8 @@ OBJS-$(CONFIG_AUDIO_FRAME_QUEUE) += audio_frame_queue.o OBJS-$(CONFIG_CRYSTALHD) += crystalhd.o OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o OBJS-$(CONFIG_DXVA2) += dxva2.o -OBJS-$(CONFIG_DSPUTIL) += dsputil.o faanidct.o \ - simple_idct.o \ - jrevdct.o +OBJS-$(CONFIG_DSPUTIL) += dsputil.o faanidct.o \ + simple_idct.o jrevdct.o OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o cos_fixed_tables.o |