RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/mov: Do not hard fail if bit rate calculation overflows unless in explode mode 

bit_rate is not a critical field, and we shouln't hard fail if we
can't caluclate it due to a large timebase - it needlessly breaks
valid files.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2021-10-12 14:48:31 +01:00
parent a987b5c9ee
commit 7216458c96
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/mov.c
View File

@ -7992,10 +7992,11 @@ static int mov_read_header(AVFormatContext *s)
/* Akin to sc->data_size * 8 * sc->time_scale / st->duration but accounting for overflows. */
st->codecpar->bit_rate = av_rescale(sc->data_size, ((int64_t) sc->time_scale) * 8, st->duration);
if (st->codecpar->bit_rate == INT64_MIN) {
av_log(s, AV_LOG_ERROR, "Overflow during bit rate calculation %"PRId64" * 8 * %d\n",
av_log(s, AV_LOG_WARNING, "Overflow during bit rate calculation %"PRId64" * 8 * %d\n",
sc->data_size, sc->time_scale);
st->codecpar->bit_rate = 0;
return AVERROR_INVALIDDATA;
if (s->error_recognition & AV_EF_EXPLODE)
return AVERROR_INVALIDDATA;
}
}
}
@ -8009,10 +8010,11 @@ static int mov_read_header(AVFormatContext *s)
/* Akin to sc->data_size * 8 * sc->time_scale / sc->duration_for_fps but accounting for overflows. */
st->codecpar->bit_rate = av_rescale(sc->data_size, ((int64_t) sc->time_scale) * 8, sc->duration_for_fps);
if (st->codecpar->bit_rate == INT64_MIN) {
av_log(s, AV_LOG_ERROR, "Overflow during bit rate calculation %"PRId64" * 8 * %d\n",
av_log(s, AV_LOG_WARNING, "Overflow during bit rate calculation %"PRId64" * 8 * %d\n",
sc->data_size, sc->time_scale);
st->codecpar->bit_rate = 0;
return AVERROR_INVALIDDATA;
if (s->error_recognition & AV_EF_EXPLODE)
return AVERROR_INVALIDDATA;
}
}
}