diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 10:39:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 10:46:39 +0100 |
| commit | a2bfee36b70bc9a5dd0a5a1cef36ca32bc1fba07 (patch) | |
| tree | 01531bd775ded92bdfe25952a27c83655d7fc1c7 /libavformat/allformats.c | |
| parent | fc5fe4804fd2ee9a29de502e9431b12d027c0c89 (diff) | |
| parent | 9af7a8523a6bb517834ebed36093bdab11a8b38e (diff) | |
| download | ffmpeg-a2bfee36b70bc9a5dd0a5a1cef36ca32bc1fba07.tar.gz | |
Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
HNM4/HNM4A demuxer & video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
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 781e4c488a..bba9573587 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -136,6 +136,7 @@ void av_register_all(void) REGISTER_MUXDEMUX(H264, h264); REGISTER_DEMUXER (HEVC, hevc); REGISTER_MUXDEMUX(HLS, hls); + REGISTER_DEMUXER (HNM, hnm); REGISTER_MUXDEMUX(ICO, ico); REGISTER_DEMUXER (IDCIN, idcin); REGISTER_DEMUXER (IDF, idf); |