From cc8d87b79358644d4b280f40b687a06130cc8fb7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 26 Jan 2008 22:57:53 +0000 Subject: [PATCH] Set subtitle codec id correctly, i hope this does not break anything. Originally committed as revision 11627 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 6080f7d5c..cc3dc7021 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -233,7 +233,6 @@ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) 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 */ @@ -788,6 +787,8 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) st->codec->bits_per_sample = bits_per_sample; sc->sample_size = (bits_per_sample >> 3) * st->codec->channels; } + } else if(st->codec->codec_type==CODEC_TYPE_SUBTITLE){ + st->codec->codec_id= id; } else { /* other codec type, just skip (rtp, mp4s, tmcd ...) */ url_fskip(pb, size - (url_ftell(pb) - start_pos)); -- 2.11.0