height = avio_rl32(pb);
smk->frames = avio_rl32(pb);
pts_inc = avio_rl32(pb);
- if (pts_inc > INT_MAX / 100) {
- av_log(s, AV_LOG_ERROR, "pts_inc %d is too large\n", pts_inc);
+ if (pts_inc > INT_MAX / 100 || pts_inc == INT_MIN) {
+ av_log(s, AV_LOG_ERROR, "pts_inc %d is invalid\n", pts_inc);
return AVERROR_INVALIDDATA;
}
smk->frame_size -= size;
size -= 4;
- if (smk->indexes[i] < 0) {
- avio_skip(s->pb, size);
+ if (smk->indexes[i] < 0 ||
+ s->streams[smk->indexes[i]]->discard >= AVDISCARD_ALL) {
+ smk->aud_pts[i] += smk->duration_size[i] ? avio_rl32(s->pb)
+ : size;
+ avio_skip(s->pb, size - smk->duration_size[i]);
continue;
}
if ((ret = av_get_packet(s->pb, pkt, size)) != size) {
}
}
+ if (s->streams[smk->videoindex]->discard >= AVDISCARD_ALL) {
+ ret = FFERROR_REDO;
+ goto next_frame;
+ }
if (smk->frame_size >= INT_MAX/2) {
ret = AVERROR_INVALIDDATA;
goto next_frame;