diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 22:07:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 22:13:50 +0100 |
| commit | b5b15c4dd943fdb9fe57675a8926510be305223e (patch) | |
| tree | 30f5f63c75ba1f9d257260cf48738aa7b507949f /libavformat/allformats.c | |
| parent | 9e0b0c60bd7fa4d4a476b93f94436a8e37d98983 (diff) | |
| parent | fe5e6e34c05e274f98528be4f77f3c474473f977 (diff) | |
Merge commit 'fe5e6e34c05e274f98528be4f77f3c474473f977'
* commit 'fe5e6e34c05e274f98528be4f77f3c474473f977':
lavf: Add an MPEG-DASH ISOFF segmenting muxer
Conflicts:
Changelog
libavformat/Makefile
libavformat/allformats.c
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 e82ef2bb0d..3f60d7d9c7 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -101,6 +101,7 @@ void av_register_all(void) REGISTER_DEMUXER (CINE, cine); REGISTER_DEMUXER (CONCAT, concat); REGISTER_MUXER (CRC, crc); + REGISTER_MUXER (DASH, dash); REGISTER_MUXDEMUX(DATA, data); REGISTER_MUXDEMUX(DAUD, daud); REGISTER_DEMUXER (DFA, dfa); |