summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure1
-rw-r--r--libavformat/Makefile2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 2af4d2a558..92b224bcac 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 0b788c94c4..231e127228 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