diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 10:37:03 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 10:38:03 +0100 |
commit | 641358addcffe0cca55c547316781b11e9315dbc (patch) | |
tree | 8abcbe8639b1c14841ec9b3536a8b7fbdb83d88b /libavformat/allformats.c | |
parent | 1344c0453615a1f0141b11f5f4e3c640ee890afc (diff) | |
parent | 435214a757fc71d1680b12d6f930254cab3935d1 (diff) | |
download | ffmpeg-641358addcffe0cca55c547316781b11e9315dbc.tar.gz |
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 'libavformat/allformats.c')
-rw-r--r-- | libavformat/allformats.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index bba9573587..0841167216 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -134,6 +134,7 @@ void av_register_all(void) REGISTER_MUXDEMUX(H261, h261); REGISTER_MUXDEMUX(H263, h263); REGISTER_MUXDEMUX(H264, h264); + REGISTER_MUXER (HDS, hds); REGISTER_DEMUXER (HEVC, hevc); REGISTER_MUXDEMUX(HLS, hls); REGISTER_DEMUXER (HNM, hnm); |