Merge commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 22:19:41 +0000 (00:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 22:19:41 +0000 (00:19 +0200)
* commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9':
  build: Add missing object files for Matroska demuxer

Conflicts:
libavcodec/Makefile
libavformat/Makefile

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

@@@ -672,12 -563,12 +672,12 @@@ OBJS-$(CONFIG_GXF_DEMUXER)             
  OBJS-$(CONFIG_IFF_DEMUXER)             += iff.o
  OBJS-$(CONFIG_ISMV_MUXER)              += mpeg4audio.o mpegaudiodata.o
  OBJS-$(CONFIG_LATM_MUXER)              += mpeg4audio.o
 -OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += xiph.o mpeg4audio.o           \
 +OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += xiph.o mpeg4audio.o vorbis_data.o \
                                            flac.o flacdata.o
- OBJS-$(CONFIG_MATROSKA_DEMUXER)        += mpeg4audio.o mpegaudiodata.o \
+ OBJS-$(CONFIG_MATROSKA_DEMUXER)        += mpeg4audio.o mpegaudiodata.o  \
                                            vorbis_parser.o xiph.o
  OBJS-$(CONFIG_MATROSKA_MUXER)          += mpeg4audio.o mpegaudiodata.o  \
 -                                          flac.o flacdata.o xiph.o
 +                                          flac.o flacdata.o vorbis_data.o xiph.o
  OBJS-$(CONFIG_MP2_MUXER)               += mpegaudiodata.o mpegaudiodecheader.o
  OBJS-$(CONFIG_MP3_MUXER)               += mpegaudiodata.o mpegaudiodecheader.o
  OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o ac3tab.o
@@@ -207,9 -165,9 +207,9 @@@ OBJS-$(CONFIG_LXF_DEMUXER
  OBJS-$(CONFIG_M4V_DEMUXER)               += m4vdec.o rawdec.o
  OBJS-$(CONFIG_M4V_MUXER)                 += rawenc.o
  OBJS-$(CONFIG_MATROSKA_DEMUXER)          += matroskadec.o matroska.o  \
 -                                            isom.o rmsipr.o \
 +                                            isom.o rmsipr.o flac_picture.o \
                                              oggparsevorbis.o vorbiscomment.o \
-                                             replaygain.o
+                                             flac_picture.o replaygain.o
  OBJS-$(CONFIG_MATROSKA_MUXER)            += matroskaenc.o matroska.o \
                                              isom.o avc.o hevc.o \
                                              flacenc_header.o avlanguage.o vorbiscomment.o wv.o