diff options
| author | Michael Niedermayer <[email protected]> | 2013-05-01 20:16:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-05-01 20:16:26 +0200 |
| commit | d602f16a377a84c5ba843c2d1ae03f8085ae758d (patch) | |
| tree | 486f3f1dd94429bab4906341da3d7e2b8ad0d66d /libavformat/allformats.c | |
| parent | 67731ef40f9f86ca870ae4c5dbbe01ead8dba962 (diff) | |
| parent | ceb33f3aee157ea7d7be33c6df602e6be9d23536 (diff) | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavc: copy subtitle_header when copying context.
lavf: data muxer and demuxer.
Merged-by: Michael Niedermayer <[email protected]>
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 f29843a52e..bca2c401a5 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -100,6 +100,7 @@ void av_register_all(void) REGISTER_DEMUXER (CDXL, cdxl); REGISTER_DEMUXER (CONCAT, concat); REGISTER_MUXER (CRC, crc); + REGISTER_MUXDEMUX(DATA, data); REGISTER_MUXDEMUX(DAUD, daud); REGISTER_DEMUXER (DFA, dfa); REGISTER_MUXDEMUX(DIRAC, dirac); |