diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:48:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 22:02:41 +0100 |
| commit | d8901c2f018ec85e12bfd7d1a7d5dd76229db85e (patch) | |
| tree | 695351df0fbfa77c386a8190382b9c78e9751d50 /libavcodec/Makefile | |
| parent | 6998400c618fb267acb6b7281418f3b89fcabc8a (diff) | |
| parent | b339019de4e5f4d3c661bbdba98ae248ab77e2f0 (diff) | |
| download | ffmpeg-d8901c2f018ec85e12bfd7d1a7d5dd76229db85e.tar.gz | |
Merge commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0'
* commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0':
dca: Split code for handling the EXSS extension off into a separate file
Conflicts:
libavcodec/Makefile
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7d3b423462..2aa5120b81 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -189,7 +189,7 @@ 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 \ - synth_filter.o + dca_exss.o synth_filter.o OBJS-$(CONFIG_DCA_ENCODER) += dcaenc.o dca.o OBJS-$(CONFIG_DIRAC_DECODER) += diracdec.o dirac.o diracdsp.o \ dirac_arith.o mpeg12data.o dirac_dwt.o |