diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-01 02:55:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-01 02:58:15 +0200 |
| commit | 7ac167493e5404fd2d3f307d02127f23fca970f0 (patch) | |
| tree | bea8a71cd59b1ea9a63692f7df1bdedb8446a9c1 /libavcodec/Makefile | |
| parent | 859676dd426e7051b41b174886e6e64271e93cdc (diff) | |
| parent | e006d71fa849542eb27146efac629288703b3d75 (diff) | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
mpegts: propagate avio EOF in read_packet()
configure: Initial support for --target-os=symbian
Fixed-point FFT and MDCT
Include dependencies for test programs
ac3enc: simplify sym_quant()
flvdec: read index stored in the 'keyframes' tag.
mov: Add support for zero-sized stsc runs.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index d28131c591..1eb39b8141 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -32,15 +32,16 @@ OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o OBJS-$(CONFIG_DCT) += dct.o OBJS-$(CONFIG_DWT) += dwt.o OBJS-$(CONFIG_DXVA2) += dxva2.o -FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o -OBJS-$(CONFIG_FFT) += avfft.o fft.o $(FFT-OBJS-yes) +FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o cos_fixed_tables.o +OBJS-$(CONFIG_FFT) += avfft.o fft_fixed.o fft_float.o \ + $(FFT-OBJS-yes) OBJS-$(CONFIG_GOLOMB) += golomb.o OBJS-$(CONFIG_H264DSP) += h264dsp.o h264idct.o OBJS-$(CONFIG_H264PRED) += h264pred.o OBJS-$(CONFIG_HUFFMAN) += huffman.o OBJS-$(CONFIG_LPC) += lpc.o OBJS-$(CONFIG_LSP) += lsp.o -OBJS-$(CONFIG_MDCT) += mdct.o +OBJS-$(CONFIG_MDCT) += mdct_fixed.o mdct_float.o RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) OBJS-$(CONFIG_SINEWIN) += sinewin.o @@ -676,6 +677,9 @@ $(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o $(SUBDIR)cos_tables.c: $(SUBDIR)costablegen$(HOSTEXESUF) $(M)./$< > $@ +$(SUBDIR)cos_fixed_tables.c: $(SUBDIR)costablegen$(HOSTEXESUF) + $(M)./$< cos fixed > $@ + $(SUBDIR)sin_tables.c: $(SUBDIR)costablegen$(HOSTEXESUF) $(M)./$< sin > $@ |