Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 11:19:26 +0000 (13:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 11:19:26 +0000 (13:19 +0200)
* commit '106b62f4ba600f24415eaded5e020aeceb23fd59':
  matroskaenc: write the channel mask for FLAC

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/Makefile
libavformat/matroskaenc.c

@@@ -209,11 -170,8 +209,11 @@@ OBJS-$(CONFIG_MATROSKA_DEMUXER
                                              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
 +OBJS-$(CONFIG_MICRODVD_MUXER)            += microdvdenc.o
  OBJS-$(CONFIG_MJPEG_DEMUXER)             += rawdec.o
  OBJS-$(CONFIG_MJPEG_MUXER)               += rawenc.o
  OBJS-$(CONFIG_MLP_DEMUXER)               += rawdec.o
@@@ -31,7 -30,7 +31,8 @@@
  #include "isom.h"
  #include "matroska.h"
  #include "riff.h"
 +#include "subtitles.h"
+ #include "vorbiscomment.h"
  #include "wv.h"
  
  #include "libavutil/avstring.h"