[SCM] libav/experimental: Fix more matroska/webm muxer dependencies

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 223cefb560a7c296fec78d898473cc5ce7fa807b
Author: Martin Storsjö <martin at martin.st>
Date:   Tue Dec 21 09:28:39 2010 +0000

    Fix more matroska/webm muxer dependencies
    
    This fixes building with --disable-everything --enable-muxer=matroska and/or
    --enable-muxer=webm
    
    Originally committed as revision 26067 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 8a9a8dd..a633d42 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -524,7 +524,8 @@ OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += xiph.o mpeg4audio.o \
                                           flacdec.o flacdata.o flac.o
 OBJS-$(CONFIG_MATROSKA_DEMUXER)        += mpeg4audio.o
 OBJS-$(CONFIG_MATROSKA_MUXER)          += xiph.o mpeg4audio.o \
-                                          flacdec.o flacdata.o flac.o
+                                          flacdec.o flacdata.o flac.o \
+                                          mpegaudiodata.o
 OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
 OBJS-$(CONFIG_MPEGTS_MUXER)            += mpegvideo.o mpeg4audio.o
 OBJS-$(CONFIG_NUT_MUXER)               += mpegaudiodata.o
@@ -533,7 +534,8 @@ OBJS-$(CONFIG_OGG_DEMUXER)             += flacdec.o flacdata.o flac.o \
 OBJS-$(CONFIG_OGG_MUXER)               += xiph.o flacdec.o flacdata.o flac.o
 OBJS-$(CONFIG_RTP_MUXER)               += mpegvideo.o xiph.o
 OBJS-$(CONFIG_WEBM_MUXER)              += xiph.o mpeg4audio.o \
-                                          flacdec.o flacdata.o flac.o
+                                          flacdec.o flacdata.o flac.o \
+                                          mpegaudiodata.o
 
 # external codec libraries
 OBJS-$(CONFIG_LIBDIRAC_DECODER)           += libdiracdec.o

-- 
Libav/FFmpeg packaging