[SCM] libav/experimental: build: Add missing object files for Matroska demuxer

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 03391b5432a2b8b8dbc3d2db722a54dfb68737b9
Author: Diego Biurrun <diego at biurrun.de>
Date:   Fri Jun 20 03:22:10 2014 -0700

    build: Add missing object files for Matroska demuxer

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c2f7532..9cf2bea 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -565,7 +565,8 @@ OBJS-$(CONFIG_ISMV_MUXER)              += mpeg4audio.o mpegaudiodata.o
 OBJS-$(CONFIG_LATM_MUXER)              += mpeg4audio.o
 OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += xiph.o mpeg4audio.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
 OBJS-$(CONFIG_MP2_MUXER)               += mpegaudiodata.o mpegaudiodecheader.o
diff --git a/libavformat/Makefile b/libavformat/Makefile
index a26ffcd..51bd7c2 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -166,7 +166,8 @@ 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 \
-                                            oggparsevorbis.o vorbiscomment.o
+                                            oggparsevorbis.o vorbiscomment.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

-- 
Libav/FFmpeg packaging