summaryrefslogtreecommitdiff
path: root/libavformat/allformats.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-09-26 02:19:21 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-09-26 02:19:21 +0000
commitde3ae185a4b168ffb79c8d966bc89a4f174e2d54 (patch)
tree502c6bd1605080e63c210d4df7e426a275bc0c10 /libavformat/allformats.c
parentfb1d2d7be2803ccb1a92a86bbe61a2fba4b9a693 (diff)
2 in 1, an ASS and SSA demuxer.
Tested with -scodec copy on all ASS & SSA samples that i found on mphq (exactly 2). Originally committed as revision 15422 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/allformats.c')
-rw-r--r--libavformat/allformats.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 49d65f0372..d644879b77 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -59,6 +59,7 @@ void av_register_all(void)
REGISTER_DEMUXER (APC, apc);
REGISTER_DEMUXER (APE, ape);
REGISTER_MUXDEMUX (ASF, asf);
+ REGISTER_DEMUXER (ASS, ass);
REGISTER_MUXER (ASF_STREAM, asf_stream);
REGISTER_MUXDEMUX (AU, au);
REGISTER_MUXDEMUX (AVI, avi);