diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-13 22:21:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-13 22:22:24 +0200 |
| commit | 674216991d409316155695baeb6b69c22c758815 (patch) | |
| tree | 97b390e16c5f2378f193499224a05445d9715bd0 /libavformat/Makefile | |
| parent | af285072b5d226bb0032b8576d132d01e2d22fa1 (diff) | |
| parent | 47aed43990e2bf31d0599d5ac862afa5e264a601 (diff) | |
| download | ffmpeg-674216991d409316155695baeb6b69c22c758815.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Fix APE tag dependencies
MS Expression Encoder Screen decoder
libfdk-aac: Allow setting the encoder bandwidth/cutoff frequency
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 7a6d2f5345..a3ddcad405 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -41,7 +41,7 @@ OBJS-$(CONFIG_AMR_DEMUXER) += amr.o OBJS-$(CONFIG_AMR_MUXER) += amr.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_APC_DEMUXER) += apc.o -OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o +OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o OBJS-$(CONFIG_ASF_DEMUXER) += asfdec.o asf.o asfcrypt.o \ avlanguage.o OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o @@ -172,8 +172,8 @@ OBJS-$(CONFIG_MOV_MUXER) += movenc.o isom.o avc.o \ OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o id3v2enc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o -OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o apetag.o -OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o apetag.o +OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o apetag.o img2.o +OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o apetag.o img2.o OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpegenc.o OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpegenc.o OBJS-$(CONFIG_MPEG2DVD_MUXER) += mpegenc.o @@ -352,7 +352,7 @@ OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood_vqa.o OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv.o asfdec.o asf.o asfcrypt.o \ avlanguage.o mpegts.o isom.o OBJS-$(CONFIG_WTV_MUXER) += wtvenc.o wtv.o asf.o asfenc.o -OBJS-$(CONFIG_WV_DEMUXER) += wv.o apetag.o +OBJS-$(CONFIG_WV_DEMUXER) += wv.o apetag.o img2.o OBJS-$(CONFIG_XA_DEMUXER) += xa.o OBJS-$(CONFIG_XBIN_DEMUXER) += bintext.o sauce.o OBJS-$(CONFIG_XMV_DEMUXER) += xmv.o |