diff options
| author | Martin Storsjö <martin@martin.st> | 2013-08-15 16:09:27 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-08-15 22:41:11 +0300 |
| commit | c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb (patch) | |
| tree | d5d83017b4358748638394e018d59c00564365de | |
| parent | 239f55bf3c966782b781338df284f250393b9ed6 (diff) | |
| download | ffmpeg-c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb.tar.gz | |
hlsenc: Add a proper dependency on the mpegts muxer
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ö <martin@martin.st>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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 |