diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 10:37:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 10:38:08 +0200 |
| commit | 5bc892cb17225c8bfd54c12abf45012f393f03e3 (patch) | |
| tree | 9e1145ce0eaf8d5afb13e89ab6386ee9af7f330f /libavcodec/Makefile | |
| parent | c453da33a3dee16724a734d08c0c7ba71c361b67 (diff) | |
| parent | 1232a1647ab27e024a3baf4d01d40c8d08d6ced9 (diff) | |
| download | android_external_ffmpeg-5bc892cb17225c8bfd54c12abf45012f393f03e3.tar.gz android_external_ffmpeg-5bc892cb17225c8bfd54c12abf45012f393f03e3.tar.bz2 android_external_ffmpeg-5bc892cb17225c8bfd54c12abf45012f393f03e3.zip | |
Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'
* commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9':
Apple Intermediate Codec decoder
movenc: Don't add base_data_offset in tfhd for PIFF files
Conflicts:
Changelog
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 49455924f7..0982885221 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -91,6 +91,7 @@ OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3dec_data.o ac3.o kbdwin.o OBJS-$(CONFIG_AC3_ENCODER) += ac3enc_float.o ac3enc.o ac3tab.o \ ac3.o kbdwin.o OBJS-$(CONFIG_AC3_FIXED_ENCODER) += ac3enc_fixed.o ac3enc.o ac3tab.o ac3.o +OBJS-$(CONFIG_AIC_DECODER) += aic.o OBJS-$(CONFIG_ALAC_DECODER) += alac.o alac_data.o OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o alac_data.o OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mpeg4audio.o |