diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:10:39 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:11:33 +0200 |
commit | 69ea65b46f1a101f9a4f2c914c75b752122e7cbe (patch) | |
tree | 19e9bfa95c01a5739802ddd1704e1486a6cbd4ad /libavcodec/Makefile | |
parent | a0fb6083967afcd7f2c43ab3ff1e510912644daa (diff) | |
parent | 3e5898782dce60334ab294821ca00b19c648cf66 (diff) |
Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
Voxware MetaSound decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8b69fb654a..b6b4263679 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -261,6 +261,8 @@ OBJS-$(CONFIG_LOCO_DECODER) += loco.o OBJS-$(CONFIG_MACE3_DECODER) += mace.o OBJS-$(CONFIG_MACE6_DECODER) += mace.o OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o +OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \ + twinvq.o OBJS-$(CONFIG_MICRODVD_DECODER) += microdvddec.o ass.o OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o |