aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/isom.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-01-26 20:30:03 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-01-26 20:30:03 +0000
commit1e3c9307e628063811a9c8a0417854a6f73f8252 (patch)
tree5b093f42ee7b411f0739ed7ccfe25f1fa82142f4 /libavformat/isom.c
parent41e19673ef73c9ee7907bc8bfaffbb69c54eb9c1 (diff)
downloadffmpeg-1e3c9307e628063811a9c8a0417854a6f73f8252.tar.gz
Set correct codec type and id for text subtitles.
fixes http://samples.mplayerhq.hu/mov/subtitles-embedded/subtitlemovie.mov closes issue341 Originally committed as revision 11624 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/isom.c')
-rw-r--r--libavformat/isom.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 9df273cf6e..f20d8568ac 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -167,6 +167,11 @@ const AVCodecTag codec_movaudio_tags[] = {
{ CODEC_ID_NONE, 0 },
};
+const AVCodecTag ff_codec_movsubtitle_tags[] = {
+ { CODEC_ID_TEXT, MKTAG('t', 'e', 'x', 't') },
+ { CODEC_ID_NONE, 0 },
+};
+
/* map numeric codes from mdhd atom to ISO 639 */
/* cf. QTFileFormat.pdf p253, qtff.pdf p205 */
/* http://developer.apple.com/documentation/mac/Text/Text-368.html */