mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'
* commit '9272c965d9559a90ee64d46aebd99c117e07f7a3':
matroskaenc: Fix type used for chapter timestamps
Conflicts:
libavformat/matroskaenc.c
See: a4cd057bc7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
e48ff13ba7
|
@ -1078,7 +1078,8 @@ static int mkv_write_chapters(AVFormatContext *s)
|
||||||
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 || chapterend < 0) {
|
if (chapterstart < 0 || chapterstart > chapterend || chapterend < 0) {
|
||||||
av_log(s, AV_LOG_ERROR, "Invalid chapter start (%"PRId64") or end (%"PRId64").\n",
|
av_log(s, AV_LOG_ERROR,
|
||||||
|
"Invalid chapter start (%"PRId64") or end (%"PRId64").\n",
|
||||||
chapterstart, chapterend);
|
chapterstart, chapterend);
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue