diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-01-26 22:57:53 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-01-26 22:57:53 +0000 |
| commit | cc8d87b79358644d4b280f40b687a06130cc8fb7 (patch) | |
| tree | 8853bb7c7c4b49c6aeaa45a83ce96a848ec0c62b /libavformat/mov.c | |
| parent | e73e3a926d1d16ea3176794ea512e8ccdb3a9754 (diff) | |
| download | ffmpeg-cc8d87b79358644d4b280f40b687a06130cc8fb7.tar.gz | |
Set subtitle codec id correctly, i hope this does not break anything.
Originally committed as revision 11627 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 6080f7d5c4..cc3dc70211 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)); |