diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-02-15 15:25:14 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-02-15 15:25:14 +0000 |
| commit | 6cb6e159f886f3b2fe5986e048cd13f153bf9c3d (patch) | |
| tree | df4a7c37fe7872c5b2af8b632f983adce685a5e1 /libavformat | |
| parent | c99a35768f754fa74177f19a87d5a3b7f3be8fab (diff) | |
matroskadec: use new metadata API to export some simple information
Originally committed as revision 17328 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 3a2209f318..c938a1ddd6 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -154,6 +154,8 @@ typedef struct { uint64_t end; uint64_t uid; char *title; + + AVChapter *chapter; } MatroskaChapter; typedef struct { @@ -1103,9 +1105,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) if (matroska->duration) matroska->ctx->duration = matroska->duration * matroska->time_scale * 1000 / AV_TIME_BASE; - if (matroska->title) - strncpy(matroska->ctx->title, matroska->title, - sizeof(matroska->ctx->title)-1); + av_metadata_set(&s->metadata, "title", matroska->title); matroska_convert_tags(s, &matroska->tags); tracks = matroska->tracks.elem; @@ -1294,7 +1294,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec->codec_id = codec_id; st->start_time = 0; if (strcmp(track->language, "und")) - av_strlcpy(st->language, track->language, 4); + av_metadata_set(&st->metadata, "language", track->language); if (track->flag_default) st->disposition |= AV_DISPOSITION_DEFAULT; @@ -1346,7 +1346,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) AVStream *st = av_new_stream(s, 0); if (st == NULL) break; - st->filename = av_strdup(attachements[j].filename); + av_metadata_set(&st->metadata, "filename",attachements[j].filename); st->codec->codec_id = CODEC_ID_NONE; st->codec->codec_type = CODEC_TYPE_ATTACHMENT; st->codec->extradata = av_malloc(attachements[j].bin.size); @@ -1369,9 +1369,12 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) for (i=0; i<chapters_list->nb_elem; i++) if (chapters[i].start != AV_NOPTS_VALUE && chapters[i].uid && (max_start==0 || chapters[i].start > max_start)) { + chapters[i].chapter = ff_new_chapter(s, chapters[i].uid, (AVRational){1, 1000000000}, chapters[i].start, chapters[i].end, chapters[i].title); + av_metadata_set(&chapters[i].chapter->metadata, + "title", chapters[i].title); max_start = chapters[i].start; } |