diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 13:05:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 13:36:54 +0200 |
| commit | 30b8f3e7dcd0318b91e205dcbf774ef92fb6193c (patch) | |
| tree | 151ff7f81b2be847087918a769a2f596a5f0bb9c /libavformat/allformats.c | |
| parent | da0616985095202434a4dfd30eb2ea09e3a57938 (diff) | |
| parent | b08569a23948db107e5e6175cd4c695427d5339d (diff) | |
Merge commit 'b08569a23948db107e5e6175cd4c695427d5339d'
* commit 'b08569a23948db107e5e6175cd4c695427d5339d':
lavf: Replace the ASF demuxer
Conflicts:
Changelog
libavformat/asf.h
libavformat/asfdec.c
libavformat/version.h
tests/ref/fate/wmv8-drm-nodec
tests/ref/seek/lavf-asf
The rewritten demuxer is placed in a new file, the current demuxer is
left as default. Carl has tested both and the one working better is
default.
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 306e0c9876..d65b7d4681 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -77,6 +77,7 @@ void av_register_all(void) REGISTER_MUXDEMUX(APNG, apng); REGISTER_DEMUXER (AQTITLE, aqtitle); REGISTER_MUXDEMUX(ASF, asf); + REGISTER_DEMUXER (ASF_O, asf_o); REGISTER_MUXDEMUX(ASS, ass); REGISTER_MUXDEMUX(AST, ast); REGISTER_MUXER (ASF_STREAM, asf_stream); |