[FFmpeg-cvslog] Fix standalone compilation of WTV demuxer.

Diego Biurrun git at videolan.org
Thu May 5 03:30:46 CEST 2011


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed May  4 18:47:07 2011 +0200| [61165a1bba939e520d01b5f029100fd700b51f2f] | committer: Diego Biurrun

Fix standalone compilation of WTV demuxer.

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

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

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 7434157..1d8452a 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -546,6 +546,7 @@ OBJS-$(CONFIG_SPDIF_DEMUXER)           += aacadtsdec.o mpeg4audio.o
 OBJS-$(CONFIG_WEBM_MUXER)              += xiph.o mpeg4audio.o \
                                           flacdec.o flacdata.o flac.o \
                                           mpegaudiodata.o
+OBJS-$(CONFIG_WTV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
 
 # external codec libraries
 OBJS-$(CONFIG_LIBDIRAC_DECODER)           += libdiracdec.o
diff --git a/libavformat/Makefile b/libavformat/Makefile
index e2e3982..ba978af 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -295,7 +295,8 @@ OBJS-$(CONFIG_WEBM_MUXER)                += matroskaenc.o matroska.o \
                                             flacenc_header.o avlanguage.o
 OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood.o
 OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood.o
-OBJS-$(CONFIG_WTV_DEMUXER)               += wtv.o asf.o asfdec.o mpegts.o riff.o
+OBJS-$(CONFIG_WTV_DEMUXER)               += wtv.o asfdec.o asf.o asfcrypt.o \
+                                            avlanguage.o mpegts.o isom.o riff.o
 OBJS-$(CONFIG_WV_DEMUXER)                += wv.o apetag.o
 OBJS-$(CONFIG_XA_DEMUXER)                += xa.o
 OBJS-$(CONFIG_XWMA_DEMUXER)              += xwma.o riff.o



More information about the ffmpeg-cvslog mailing list