[SCM] libav/experimental: fix compilation with --disable-everything --enable-muxer=mpegts

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:04:17 UTC 2013


The following commit has been merged in the experimental branch:
commit 7a397a2e1de9d75d6bb616a1a9b449b4a8dd4526
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Fri Mar 12 12:26:47 2010 +0000

    fix compilation with --disable-everything --enable-muxer=mpegts
    
    Originally committed as revision 22480 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4392d29..2253e29 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -491,7 +491,7 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER)        += mpeg4audio.o
 OBJS-$(CONFIG_MATROSKA_MUXER)          += xiph.o mpeg4audio.o \
                                           flacdec.o flacdata.o flac.o
 OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
-OBJS-$(CONFIG_MPEGTS_MUXER)            += mpegvideo.o
+OBJS-$(CONFIG_MPEGTS_MUXER)            += mpegvideo.o mpeg4audio.o
 OBJS-$(CONFIG_NUT_MUXER)               += mpegaudiodata.o
 OBJS-$(CONFIG_OGG_DEMUXER)             += flacdec.o flacdata.o flac.o \
                                           dirac.o mpeg12data.o

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list