diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 11:19:25 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 11:20:15 +0100 |
| commit | a0bc6b51d4f6d01eb4bcaec5489ca67037687a77 (patch) | |
| tree | 5618d262eea09d2ebcc227ed80a8587906ae7e92 /libavformat/Makefile | |
| parent | cd70ffaac8b74d88ed1460e10c7e9c02d067e3ca (diff) | |
| parent | e72d6fa08a3c1876109149401753a8d2c736d418 (diff) | |
| download | ffmpeg-a0bc6b51d4f6d01eb4bcaec5489ca67037687a77.tar.gz | |
Merge commit 'e72d6fa08a3c1876109149401753a8d2c736d418'
* commit 'e72d6fa08a3c1876109149401753a8d2c736d418':
build: Move MP2 muxer declaration away from MP3 muxer code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index e6bfc42dbc..5ee0debb83 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -285,7 +285,7 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.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 -OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o id3v2enc.o +OBJS-$(CONFIG_MP2_MUXER) += rawenc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o replaygain.o OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o apetag.o img2.o |