summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2008-01-29 22:37:07 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2008-01-29 22:37:07 +0000
commiteb3ba13b51f9863b6c33579e724085177d1ab56d (patch)
tree1a47ada562a73e6f45d078f5f456a20bb13d7fbc /libavformat
parent5802683a9783e4dabbbe0146018891860cabc97d (diff)
Support MP4 subtitles as in
http://samples.mplayerhq.hu/MPEG-4/embedded_subs/1Video_2Audio_2SUBs_timed_text_streams_.mp4 Originally committed as revision 11663 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/isom.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 5421875383..901a8b3ff8 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -171,6 +171,7 @@ const AVCodecTag codec_movaudio_tags[] = {
const AVCodecTag ff_codec_movsubtitle_tags[] = {
{ CODEC_ID_MOV_TEXT, MKTAG('t', 'e', 'x', 't') },
+ { CODEC_ID_MOV_TEXT, MKTAG('t', 'x', '3', 'g') },
{ CODEC_ID_NONE, 0 },
};