diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 13:37:03 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 13:38:03 +0400 |
| commit | 641358addcffe0cca55c547316781b11e9315dbc (patch) | |
| tree | 8abcbe8639b1c14841ec9b3536a8b7fbdb83d88b /configure | |
| parent | 1344c0453615a1f0141b11f5f4e3c640ee890afc (diff) | |
| parent | 435214a757fc71d1680b12d6f930254cab3935d1 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add an HDS live fragmenting muxer
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2079,6 +2079,7 @@ dxa_demuxer_select="riffdec" eac3_demuxer_select="ac3_parser" f4v_muxer_select="mov_muxer" flac_demuxer_select="flac_parser" +hds_muxer_select="flv_muxer" hls_muxer_select="mpegts_muxer" ipod_muxer_select="mov_muxer" ismv_muxer_select="mov_muxer" |