mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '9f25a109922da43c1f81273a431d3b40cb5a785a'
* commit '9f25a109922da43c1f81273a431d3b40cb5a785a': matroskaenc: Also validate chapter end time Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
2e8020c66c
|
@ -1077,8 +1077,11 @@ static int mkv_write_chapters(AVFormatContext *s)
|
||||||
int64_t chapterstart = av_rescale_q(c->start, c->time_base, scale);
|
int64_t chapterstart = av_rescale_q(c->start, c->time_base, scale);
|
||||||
int64_t chapterend = av_rescale_q(c->end, c->time_base, scale);
|
int64_t chapterend = av_rescale_q(c->end, c->time_base, scale);
|
||||||
AVDictionaryEntry *t = NULL;
|
AVDictionaryEntry *t = NULL;
|
||||||
if (chapterstart < 0 || chapterstart > chapterend)
|
if (chapterstart < 0 || chapterstart > chapterend || chapterend < 0) {
|
||||||
|
av_log(s, AV_LOG_ERROR, "Invalid chapter start (%"PRId64") or end (%"PRId64").\n",
|
||||||
|
chapterstart, chapterend);
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
|
}
|
||||||
|
|
||||||
chapteratom = start_ebml_master(pb, MATROSKA_ID_CHAPTERATOM, 0);
|
chapteratom = start_ebml_master(pb, MATROSKA_ID_CHAPTERATOM, 0);
|
||||||
put_ebml_uint(pb, MATROSKA_ID_CHAPTERUID, c->id + mkv->chapter_id_offset);
|
put_ebml_uint(pb, MATROSKA_ID_CHAPTERUID, c->id + mkv->chapter_id_offset);
|
||||||
|
|
Loading…
Reference in New Issue