From c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Thu, 15 Aug 2013 16:09:27 +0300 Subject: [PATCH] hlsenc: Add a proper dependency on the mpegts muxer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The hls muxer itself doesn't have any direct (object file level) dependencies on mpegtsenc.o, and including that object file directly doesn't ensure that it is registered so that the muxer actually is accessible. Signed-off-by: Martin Storsjö --- configure | 1 + libavformat/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 2af4d2a..92b224b 100755 --- a/configure +++ b/configure @@ -1809,6 +1809,7 @@ dirac_demuxer_select="dirac_parser" dxa_demuxer_select="riffdec" eac3_demuxer_select="ac3_parser" flac_demuxer_select="flac_parser" +hls_muxer_select="mpegts_muxer" ipod_muxer_select="mov_muxer" ismv_muxer_select="mov_muxer" matroska_audio_muxer_select="matroska_muxer" diff --git a/libavformat/Makefile b/libavformat/Makefile index 0b788c9..231e127 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -140,7 +140,7 @@ OBJS-$(CONFIG_H263_MUXER) += rawenc.o OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o OBJS-$(CONFIG_H264_MUXER) += rawenc.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o -OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o mpegtsenc.o +OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.o OBJS-$(CONFIG_IFF_DEMUXER) += iff.o OBJS-$(CONFIG_ILBC_DEMUXER) += ilbc.o -- 2.7.4