generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set subtitle codec id correctly, i hope this does not break anything.

Browse Source 
Originally committed as revision 11627 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-01-26 22:57:53 +00:00
parent e73e3a926d
commit cc8d87b793
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/mov.c
View File

@ -233,7 +233,6 @@ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
st->codec->codec_id = CODEC_ID_MP2; st->codec->codec_id = CODEC_ID_MP2;
else if(type == MKTAG('s', 'u', 'b', 'p')) { else if(type == MKTAG('s', 'u', 'b', 'p')) {
st->codec->codec_type = CODEC_TYPE_SUBTITLE; st->codec->codec_type = CODEC_TYPE_SUBTITLE;
st->codec->codec_id = CODEC_ID_DVD_SUBTITLE;
} }
get_be32(pb); /* component manufacture */ get_be32(pb); /* component manufacture */
get_be32(pb); /* component flags */ 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; st->codec->bits_per_sample = bits_per_sample;
sc->sample_size = (bits_per_sample >> 3) * st->codec->channels; 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 { } else {
/* other codec type, just skip (rtp, mp4s, tmcd ...) */ /* other codec type, just skip (rtp, mp4s, tmcd ...) */
url_fskip(pb, size - (url_ftell(pb) - start_pos)); url_fskip(pb, size - (url_ftell(pb) - start_pos));