diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 02:40:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 02:49:22 +0100 |
| commit | 815daf1607b0dc5e471a0de1132767f60c8a6fd2 (patch) | |
| tree | cf7b2e49fa673ef6452709fb9037f150da96eb93 /libavcodec/Makefile | |
| parent | 9d4f8366271ec98a07c805432775368825b9fbe5 (diff) | |
| parent | 3a651f599a18b023602370b67a77eb0efa309b20 (diff) | |
| download | ffmpeg-815daf1607b0dc5e471a0de1132767f60c8a6fd2.tar.gz | |
Merge commit '3a651f599a18b023602370b67a77eb0efa309b20'
* commit '3a651f599a18b023602370b67a77eb0efa309b20':
dca: Move data tables from a header to an object file
Conflicts:
libavcodec/Makefile
libavcodec/dcadata.h
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8dacbc114a..3b9cd2e4fa 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -189,8 +189,9 @@ OBJS-$(CONFIG_CPIA_DECODER) += cpia.o OBJS-$(CONFIG_CSCD_DECODER) += cscd.o OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o OBJS-$(CONFIG_DCA_DECODER) += dcadec.o dca.o dcadsp.o \ - dca_exss.o synth_filter.o -OBJS-$(CONFIG_DCA_ENCODER) += dcaenc.o dca.o + dcadata.o dca_exss.o \ + synth_filter.o +OBJS-$(CONFIG_DCA_ENCODER) += dcaenc.o dca.o dcadata.o OBJS-$(CONFIG_DIRAC_DECODER) += diracdec.o dirac.o diracdsp.o \ dirac_arith.o mpeg12data.o dirac_dwt.o OBJS-$(CONFIG_DFA_DECODER) += dfa.o |