diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-15 21:44:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-15 22:18:41 +0100 |
| commit | 209001073adf190ccf2e578f25d4b3d41b1640a0 (patch) | |
| tree | 11d04d4bd1eb083cfe3019bddd5e99587026fef7 /libavcodec/Makefile | |
| parent | e46a7fdc8748c286e391c1e7f2921d98a4486681 (diff) | |
| parent | 217e4ff4d1f845b76e44634e29371cd09313d1c2 (diff) | |
| download | ffmpeg-209001073adf190ccf2e578f25d4b3d41b1640a0.tar.gz | |
Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'
* commit '217e4ff4d1f845b76e44634e29371cd09313d1c2':
dca: Support for XLL (lossless extension)
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/dca.h
libavcodec/dca_exss.c
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/version.h
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 1606a9f817..4173f88cae 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -193,7 +193,7 @@ OBJS-$(CONFIG_CSCD_DECODER) += cscd.o OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o OBJS-$(CONFIG_DCA_DECODER) += dcadec.o dca.o dcadsp.o \ dcadata.o dca_exss.o \ - synth_filter.o + dca_xll.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 |