On 02/02/15 02:17, Vittorio Giovara wrote: > CC: [email protected] > Bug-Id: CID 1265717 > --- > libavformat/matroskaenc.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c > index 9dfdc5d..e751183 100644 > --- a/libavformat/matroskaenc.c > +++ b/libavformat/matroskaenc.c > @@ -915,14 +915,16 @@ static int mkv_write_chapters(AVFormatContext *s) > for (i = 0; i < s->nb_chapters; i++) { > ebml_master chapteratom, chapterdisplay; > AVChapter *c = s->chapters[i]; > + int chapterstart = av_rescale_q(c->start, c->time_base, scale); > + int chapterend = av_rescale_q(c->end, c->time_base, scale); > AVDictionaryEntry *t = NULL; > + if (chapterstart < 0 || chapterend < 0) > + return AVERROR_INVALIDDATA; > > chapteratom = start_ebml_master(pb, MATROSKA_ID_CHAPTERATOM, 0); > put_ebml_uint(pb, MATROSKA_ID_CHAPTERUID, c->id); > - put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMESTART, > - av_rescale_q(c->start, c->time_base, scale)); > - put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMEEND, > - av_rescale_q(c->end, c->time_base, scale)); > + put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMESTART, chapterstart); > + put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMEEND, chapterend); > put_ebml_uint(pb, MATROSKA_ID_CHAPTERFLAGHIDDEN , 0); > put_ebml_uint(pb, MATROSKA_ID_CHAPTERFLAGENABLED, 1); > if ((t = av_dict_get(c->metadata, "title", NULL, 0))) { >
Uhm, maybe we should make sure that start is not negative by other means but I'm fine with that patch for now. lu lu _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
