diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-26 14:50:36 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-26 15:21:59 -0300 |
| commit | 4bb09bf5a04af7a76f8bb514edf7e755066b81cd (patch) | |
| tree | 8b575bb470557d05f7b7e50e123bfb5a033bc8cd /libavformat/Makefile | |
| parent | 4576ee100b9e645ff3a63e36c500ea4b3001a198 (diff) | |
| parent | 604fbb3132e88727e496c96c92cfe02748c25a1a (diff) | |
| download | ffmpeg-4bb09bf5a04af7a76f8bb514edf7e755066b81cd.tar.gz | |
Merge commit '604fbb3132e88727e496c96c92cfe02748c25a1a'
* commit '604fbb3132e88727e496c96c92cfe02748c25a1a':
mov: Move code shared with CAF to a separate file
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 8111b4ca6a..591a14b978 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -120,8 +120,7 @@ OBJS-$(CONFIG_BOA_DEMUXER) += boadec.o OBJS-$(CONFIG_BFSTM_DEMUXER) += brstm.o OBJS-$(CONFIG_BRSTM_DEMUXER) += brstm.o OBJS-$(CONFIG_C93_DEMUXER) += c93.o voc_packet.o vocdec.o voc.o -OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o mov_chan.o \ - replaygain.o +OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov_chan.o mov_esds.o OBJS-$(CONFIG_CAF_MUXER) += cafenc.o caf.o riff.o OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o rawdec.o OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o @@ -292,7 +291,7 @@ OBJS-$(CONFIG_MLV_DEMUXER) += mlvdec.o riffdec.o OBJS-$(CONFIG_MM_DEMUXER) += mm.o OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o OBJS-$(CONFIG_MMF_MUXER) += mmf.o rawenc.o -OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.o replaygain.o +OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.o mov_esds.o replaygain.o OBJS-$(CONFIG_MOV_MUXER) += movenc.o avc.o hevc.o vpcc.o \ movenchint.o mov_chan.o rtp.o \ movenccenc.o rawutils.o |