diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:13:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 00:13:34 +0200 |
| commit | 2ca4802601c2c413af38cf2d870b03d63dbcf9b2 (patch) | |
| tree | b5cd196d3683c3a8630123aa470f87d5b70b6c84 /libavformat | |
| parent | c69f7299473d9b5a0bdae7dfddf464fefc3d16af (diff) | |
| parent | 49470b9404583ab3aff6835f78a759349d331696 (diff) | |
| download | ffmpeg-2ca4802601c2c413af38cf2d870b03d63dbcf9b2.tar.gz | |
Merge commit '49470b9404583ab3aff6835f78a759349d331696'
* commit '49470b9404583ab3aff6835f78a759349d331696':
build: Add missing replaygain object file for CAF demuxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index ecae4d0908..855b81d8c0 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -100,7 +100,7 @@ OBJS-$(CONFIG_BOA_DEMUXER) += boadec.o OBJS-$(CONFIG_BRSTM_DEMUXER) += brstm.o OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o mov_chan.o \ - isom.o + isom.o replaygain.o OBJS-$(CONFIG_CAF_MUXER) += cafenc.o caf.o riff.o isom.o OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o rawdec.o OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o |