diff options
| author | Paul B Mahol <onemda@gmail.com> | 2011-12-19 00:16:11 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 21:51:53 +0100 |
| commit | 8dce2dd9cc06a28ff46a27aeeb2913cb5ae8fa19 (patch) | |
| tree | f9e3d6f6fb16d777741c746249272e1cab0e58f8 /libavformat/allformats.c | |
| parent | 532731369a0036e6d3016f6c901a8f8a5a8640dd (diff) | |
| download | ffmpeg-8dce2dd9cc06a28ff46a27aeeb2913cb5ae8fa19.tar.gz | |
lavf: Add SMJPEG demuxer.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a4209ad6313b8b40fed2bfc7e3865cf54d4c1022)
Conflicts:
Changelog
doc/general.texi
libavformat/version.h
Signed-off-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 9593bd5a08..27de11679a 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -211,6 +211,7 @@ void av_register_all(void) REGISTER_DEMUXER (SHORTEN, shorten); REGISTER_DEMUXER (SIFF, siff); REGISTER_DEMUXER (SMACKER, smacker); + REGISTER_DEMUXER (SMJPEG, smjpeg); REGISTER_DEMUXER (SOL, sol); REGISTER_MUXDEMUX (SOX, sox); REGISTER_MUXDEMUX (SPDIF, spdif); |