Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

MOV: fix demuxing fragmented files

Browse source 
Originally committed as revision 17803 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2009-03-04 07:57:09 +00:00
parent e584914acd
commit 63581eb183
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libavformat/mov.c
View file

@ -1586,7 +1586,7 @@ static int mov_read_tfhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
flags = get_be24(pb); flags = get_be24(pb);
track_id = get_be32(pb); track_id = get_be32(pb);
if (!track_id || track_id > c->fc->nb_streams) if (!track_id)
return -1; return -1;
frag->track_id = track_id; frag->track_id = track_id;
for (i = 0; i < c->trex_count; i++) for (i = 0; i < c->trex_count; i++)
@ -1635,7 +1635,7 @@ static int mov_read_trex(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
static int mov_read_trun(MOVContext *c, ByteIOContext *pb, MOVAtom atom) static int mov_read_trun(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
{ {
MOVFragment *frag = &c->fragment; MOVFragment *frag = &c->fragment;
AVStream *st; AVStream *st = NULL;
MOVStreamContext *sc; MOVStreamContext *sc;
uint64_t offset; uint64_t offset;
int64_t dts; int64_t dts;
@ -1643,9 +1643,16 @@ static int mov_read_trun(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
unsigned entries, first_sample_flags = frag->flags; unsigned entries, first_sample_flags = frag->flags;
int flags, distance, i; int flags, distance, i;
if (!frag->track_id || frag->track_id > c->fc->nb_streams) for (i = 0; i < c->fc->nb_streams; i++) {
if (c->fc->streams[i]->id == frag->track_id) {
st = c->fc->streams[i];
break;
}
}
if (!st) {
av_log(c->fc, AV_LOG_ERROR, "could not find corresponding track id %d\n", frag->track_id);
return -1; return -1;
st = c->fc->streams[frag->track_id-1]; }
sc = st->priv_data; sc = st->priv_data;
if (sc->pseudo_stream_id+1 != frag->stsd_id) if (sc->pseudo_stream_id+1 != frag->stsd_id)
return 0; return 0;