diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 20:23:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 21:25:15 +0200 |
| commit | 6e573b77597c1039667b5d7916551b488aeef828 (patch) | |
| tree | b3c7256418744bf78ee5f7e8aac5cc9e9a2d0896 /libavformat/Makefile | |
| parent | c486cfab792e53de3f5fc9f5082909ce687a3fe8 (diff) | |
| parent | 9a07fac678a8540d076e635061bbaa4ed09a9431 (diff) | |
Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'
* commit '9a07fac678a8540d076e635061bbaa4ed09a9431':
mov: read hydrogenaudio replaygain information
Conflicts:
libavformat/Makefile
libavformat/mov.c
See: 37a15f3e669372075c88254e070c971aecb485aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 0fac33efe7..18b8817f2a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -220,7 +220,7 @@ OBJS-$(CONFIG_MLP_MUXER) += rawenc.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 isom.o mov_chan.o +OBJS-$(CONFIG_MOV_DEMUXER) += mov.o isom.o mov_chan.o replaygain.o OBJS-$(CONFIG_MOV_MUXER) += movenc.o isom.o avc.o hevc.o \ movenchint.o mov_chan.o rtp.o OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o id3v2enc.o |