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 /configure | |
parent | 83386a1f62c06c841694657778526dfebc0ba685 (diff) | |
parent | c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb (diff) | |
download | ffmpeg-streaming-dff205cca315d31ba4fc7571ef55e2331140d5eb.zip ffmpeg-streaming-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>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 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" |