projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c4ab43f
)
mov: add clcp type track as Subtitle stream.
author
Thierry Foucu
<tfoucu@gmail.com>
Thu, 21 Jul 2011 03:33:25 +0000
(20:33 -0700)
committer
Ronald S. Bultje
<rsbultje@gmail.com>
Thu, 21 Jul 2011 16:34:41 +0000
(09:34 -0700)
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
0de2bfc
..
92b1b14
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-451,7
+451,7
@@
static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
else if(type == MKTAG('m','1','a',' '))
st->codec->codec_id = CODEC_ID_MP2;
- else if(
type == MKTAG('s','u','b','p'
))
+ else if(
(type == MKTAG('s','u','b','p')) || (type == MKTAG('c','l','c','p')
))
st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
avio_rb32(pb); /* component manufacture */