diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-14 01:05:31 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-14 01:05:31 +0000 |
| commit | 8cb976931a9f85472ce595d77e5bd459f25e8817 (patch) | |
| tree | 39d56528094405472192cf4a263608a28e844756 /libavformat | |
| parent | 9eb88fdeba5b72a84f192dee48ec420a57ca208d (diff) | |
| download | ffmpeg-8cb976931a9f85472ce595d77e5bd459f25e8817.tar.gz | |
partial support for vobsub in mp4, used by nero, unsupported-embedded-subs-2.mp4
Originally committed as revision 7032 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 7f25bd9527..3ceac64b10 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -414,6 +414,10 @@ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) st->codec->codec_type = CODEC_TYPE_AUDIO; else if(type == MKTAG('m', '1', 'a', ' ')) st->codec->codec_id = CODEC_ID_MP2; + else if(type == MKTAG('s', 'u', 'b', 'p')) { + st->codec->codec_type = CODEC_TYPE_SUBTITLE; + st->codec->codec_id = CODEC_ID_DVD_SUBTITLE; + } get_be32(pb); /* component manufacture */ get_be32(pb); /* component flags */ get_be32(pb); /* component flags mask */ |