Commit e48ff13b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '9272c965'

* commit '9272c965':
  matroskaenc: Fix type used for chapter timestamps

Conflicts:
	libavformat/matroskaenc.c

See: a4cd057bMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f3a35e9d 9272c965
...@@ -1078,7 +1078,8 @@ static int mkv_write_chapters(AVFormatContext *s) ...@@ -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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment