videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-04 01:30:05 +02:00
Code Releases Activity

lavf/mov: ignore ctts entries that do not apply to a least one sample

Browse Source 
Fixes packet pts of samples which contain ctts entries with count <= 0.
This commit is contained in:
Matthieu Bouron 2016-06-16 13:16:52 +02:00
parent 0528410e04
commit acfab2dce6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/mov.c
View File

@ -2574,7 +2574,7 @@ static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{ {
AVStream *st; AVStream *st;
MOVStreamContext *sc; MOVStreamContext *sc;
unsigned int i, entries; unsigned int i, entries, ctts_count = 0;
if (c->fc->nb_streams < 1) if (c->fc->nb_streams < 1)
return 0; return 0;
@ -2600,8 +2600,16 @@ static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
int count =avio_rb32(pb); int count =avio_rb32(pb);
int duration =avio_rb32(pb); int duration =avio_rb32(pb);
sc->ctts_data[i].count = count; if (count <= 0) {
sc->ctts_data[i].duration= duration; av_log(c->fc, AV_LOG_TRACE,
"ignoring CTTS entry with count=%d duration=%d\n",
count, duration);
continue;
}
sc->ctts_data[ctts_count].count = count;
sc->ctts_data[ctts_count].duration = duration;
ctts_count++;
av_log(c->fc, AV_LOG_TRACE, "count=%d, duration=%d\n", av_log(c->fc, AV_LOG_TRACE, "count=%d, duration=%d\n",
count, duration); count, duration);
@ -2617,7 +2625,7 @@ static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
mov_update_dts_shift(sc, duration); mov_update_dts_shift(sc, duration);
} }
sc->ctts_count = i; sc->ctts_count = ctts_count;
if (pb->eof_reached) if (pb->eof_reached)
return AVERROR_EOF; return AVERROR_EOF;