diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 13:19:26 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 13:19:26 +0200 |
commit | 61917a104e0ce8d7b3b74ad66624a4f295b41c71 (patch) | |
tree | ab83309115176af4990636e4e468bd87714bb69f /libavformat/Makefile | |
parent | dff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb (diff) | |
parent | 106b62f4ba600f24415eaded5e020aeceb23fd59 (diff) |
Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'
* commit '106b62f4ba600f24415eaded5e020aeceb23fd59':
matroskaenc: write the channel mask for FLAC
Conflicts:
libavformat/matroskaenc.c
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 365481ecb2..fdd0123811 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -209,7 +209,7 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ oggparsevorbis.o vorbiscomment.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ isom.o avc.o hevc.o \ - flacenc_header.o avlanguage.o wv.o + flacenc_header.o avlanguage.o vorbiscomment.o wv.o OBJS-$(CONFIG_MD5_MUXER) += md5enc.o OBJS-$(CONFIG_MGSTS_DEMUXER) += mgsts.o OBJS-$(CONFIG_MICRODVD_DEMUXER) += microdvddec.o subtitles.o |