summaryrefslogtreecommitdiff
path: root/libavformat/assenc.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-07-25 19:36:20 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-07-25 19:36:20 +0000
commit7b53f463b4886ce3b0629b4c7355535f146856e1 (patch)
tree46b2152a8120fc09e1d0c5196c4bfa99c719e938 /libavformat/assenc.c
parent752ff3ffa7ad0920acaead00187e7d0665c98acd (diff)
add mime-type for ASS muxer
Originally committed as revision 24502 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/assenc.c')
-rw-r--r--libavformat/assenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/assenc.c b/libavformat/assenc.c
index 41d5bbdca8..9b854ec0fe 100644
--- a/libavformat/assenc.c
+++ b/libavformat/assenc.c
@@ -80,7 +80,7 @@ static int write_trailer(AVFormatContext *s)
AVOutputFormat ass_muxer = {
"ass",
NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
- NULL,
+ "text/x-ssa",
"ass,ssa",
sizeof(ASSContext),
CODEC_ID_NONE,