diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 16:03:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 16:14:38 +0100 |
| commit | 71949ef715a29878424b2fb40c471cfb71c6bb98 (patch) | |
| tree | 6d83bab24e4218eba1c840ba76081d00ba746315 /libavcodec/Makefile | |
| parent | 54a71f2e6c9d8ff42ac0367d54b9df39a31cb3ff (diff) | |
| parent | 5945c7b35d9169caf9ecef1c419eebdebb909e60 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: slice-mt: check master context for valid current_picture_ptr
h264: slice-mt: get last_pic_dropable from master context
alacenc: add support for multi-channel encoding
Conflicts:
Changelog
libavcodec/alac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1d4cb594dc..7f3bf867fa 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -89,8 +89,8 @@ 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_ALAC_DECODER) += alac.o -OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.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 OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o \ celp_math.o acelp_filters.o \ |