diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 20:09:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 20:09:18 +0100 |
| commit | e48ff13ba722f2ac37681eeea1b7813292ac87fa (patch) | |
| tree | 00cd86bb670def668cbeab81121f061d69f8945c /libavformat/matroskaenc.c | |
| parent | f3a35e9d599fc2c2cf3c253b5f34917a2e9669dd (diff) | |
| parent | 9272c965d9559a90ee64d46aebd99c117e07f7a3 (diff) | |
Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'
* commit '9272c965d9559a90ee64d46aebd99c117e07f7a3':
matroskaenc: Fix type used for chapter timestamps
Conflicts:
libavformat/matroskaenc.c
See: a4cd057bc7ddd2dd094d2ae7b0d6843ade95a626
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1c0e3abee8..be4d689bfe 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1078,7 +1078,8 @@ static int mkv_write_chapters(AVFormatContext *s) int64_t chapterend = av_rescale_q(c->end, c->time_base, scale); AVDictionaryEntry *t = NULL; 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); return AVERROR_INVALIDDATA; } |