Mercurial > libavformat.hg
changeset 3334:7a823a401282 libavformat
Pass time_base as argument to new_chapter() as well.
This fixes the wrong timebase the matroska demuxer had after my previous commits.
Maybe we should reduce new_chapter() to just (AVFormatContext, int id) ?
| author | michael |
|---|---|
| date | Fri, 23 May 2008 18:15:13 +0000 |
| parents | 8bec7ae8f0bb |
| children | efed46e8afb3 |
| files | avformat.h matroskadec.c nutdec.c utils.c |
| diffstat | 4 files changed, 9 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Fri May 23 17:56:45 2008 +0000 +++ b/avformat.h Fri May 23 18:15:13 2008 +0000 @@ -776,13 +776,13 @@ * * @param s media file handle * @param id unique id for this chapter - * @param start chapter start time in AV_TIME_BASE units - * @param end chapter end time in AV_TIME_BASE units + * @param start chapter start time in time_base units + * @param end chapter end time in time_base units * @param title chapter title * * @return AVChapter or NULL if error. */ -AVChapter *ff_new_chapter(AVFormatContext *s, int id, int64_t start, int64_t end, const char *title); +AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base, int64_t start, int64_t end, const char *title); /** * Set the pts for a given stream.
--- a/matroskadec.c Fri May 23 17:56:45 2008 +0000 +++ b/matroskadec.c Fri May 23 18:15:13 2008 +0000 @@ -2254,10 +2254,7 @@ } if (start != AV_NOPTS_VALUE && uid != -1) { - start = start * AV_TIME_BASE / 1000000000; - if (end != AV_NOPTS_VALUE) - end = end * AV_TIME_BASE / 1000000000; - if(!ff_new_chapter(s, uid, start, end, title)) + if(!ff_new_chapter(s, uid, (AVRational){1, 1000000000}, start, end, title)) res= AVERROR(ENOMEM); } av_free(title);
--- a/nutdec.c Fri May 23 17:56:45 2008 +0000 +++ b/nutdec.c Fri May 23 18:15:13 2008 +0000 @@ -406,8 +406,9 @@ if(chapter_id && !stream_id_plus1){ int64_t start= chapter_start / nut->time_base_count; - chapter= ff_new_chapter(s, chapter_id, start, start + chapter_len, NULL); - chapter->time_base= nut->time_base[chapter_start % nut->time_base_count]; + chapter= ff_new_chapter(s, chapter_id, + nut->time_base[chapter_start % nut->time_base_count], + start, start + chapter_len, NULL); } for(i=0; i<count; i++){
--- a/utils.c Fri May 23 17:56:45 2008 +0000 +++ b/utils.c Fri May 23 18:15:13 2008 +0000 @@ -2246,7 +2246,7 @@ } } -AVChapter *ff_new_chapter(AVFormatContext *s, int id, int64_t start, int64_t end, const char *title) +AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base, int64_t start, int64_t end, const char *title) { AVChapter *chapter = NULL; int i; @@ -2265,6 +2265,7 @@ av_free(chapter->title); chapter->title = av_strdup(title); chapter->id = id; + chapter->time_base= time_base; chapter->start = start; chapter->end = end;