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

support mp4 fragmented files without any samples in the moov atom

Browse source 
Originally committed as revision 12635 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-03-30 21:15:06 +00:00
parent 44e43aab03
commit 5e788d588b
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libavformat/mov.c
View file

@ -1235,8 +1235,8 @@ static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
return ret; return ret;
/* sanity checks */ /* sanity checks */
if(!sc->stts_count || !sc->chunk_count || !sc->sample_to_chunk_sz || if(sc->chunk_count && (!sc->stts_count || !sc->sample_to_chunk_sz ||
(!sc->sample_size && !sc->sample_count)){ (!sc->sample_size && !sc->sample_count))){
av_log(c->fc, AV_LOG_ERROR, "stream %d, missing mandatory atoms, broken header\n", av_log(c->fc, AV_LOG_ERROR, "stream %d, missing mandatory atoms, broken header\n",
st->index); st->index);
sc->sample_count = 0; //ignore track sc->sample_count = 0; //ignore track
@ -1456,8 +1456,6 @@ static int mov_read_trun(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
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;
if (!st->nb_index_entries)
return -1;
get_byte(pb); /* version */ get_byte(pb); /* version */
flags = get_be24(pb); flags = get_be24(pb);
entries = get_be32(pb); entries = get_be32(pb);