diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 13:43:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 13:43:31 +0200 |
| commit | dff205cca315d31ba4fc7571ef55e2331140d5eb (patch) | |
| tree | 0921f60a03d7b9e07bd59b47a9852bff9de31d4c | |
| parent | 83386a1f62c06c841694657778526dfebc0ba685 (diff) | |
| parent | c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb (diff) | |
| download | ffmpeg-dff205cca315d31ba4fc7571ef55e2331140d5eb.tar.gz | |
Merge commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb'
* commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb':
hlsenc: Add a proper dependency on the mpegts muxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -2044,6 +2044,7 @@ dxa_demuxer_select="riffdec" eac3_demuxer_select="ac3_parser" f4v_muxer_select="mov_muxer" flac_demuxer_select="flac_parser" +hls_muxer_select="mpegts_muxer" ipod_muxer_select="mov_muxer" ismv_muxer_select="mov_muxer" libnut_demuxer_deps="libnut" diff --git a/libavformat/Makefile b/libavformat/Makefile index 4422a981f5..35d49f7302 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -167,7 +167,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_ICO_DEMUXER) += icodec.o OBJS-$(CONFIG_ICO_MUXER) += icoenc.o OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.o |