[FFmpeg-cvslog] Fix compilation with --disable-everything --enable-demuxer=matroska.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat May 31 16:27:48 2014 +0200| [aab2e939a9a1bbf72469a690808dd9644c85ccee] | committer: Carl Eugen Hoyos

Fix compilation with --disable-everything --enable-demuxer=matroska.

Fixes ticket #3693.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aab2e939a9a1bbf72469a690808dd9644c85ccee
---

 libavcodec/Makefile  |    3 ++-
 libavformat/Makefile |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 18a3368..ce8521f 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -671,7 +671,8 @@ OBJS-$(CONFIG_ISMV_MUXER)              += mpeg4audio.o mpegaudiodata.o
 OBJS-$(CONFIG_LATM_MUXER)              += 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 vorbis_data.o xiph.o
 OBJS-$(CONFIG_MP2_MUXER)               += mpegaudiodata.o mpegaudiodecheader.o
diff --git a/libavformat/Makefile b/libavformat/Makefile
index fdd0123..7b7156c 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -205,7 +205,7 @@ OBJS-$(CONFIG_LXF_DEMUXER)               += lxfdec.o
 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
 OBJS-$(CONFIG_MATROSKA_MUXER)            += matroskaenc.o matroska.o \
                                             isom.o avc.o hevc.o \