virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/matroskaenc: Convert chapter metadata

Browse Source 
It is no longer converted since mkv_write_chapters() is called
before mkv_write_tags() which happens since commit
4ebfc13c33. Given the fact that
chapters can also be written late, mkv_write_chapters() has to
convert the metadata itself.

Fixes ticket #9812.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-06-15 08:27:58 +02:00
parent 49a63c6c66
commit 672987b2db
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/matroskaenc.c
View File

@@ -2104,7 +2104,7 @@ static int mkv_write_chapters(AVFormatContext *s)
create_new_ids = mkv_new_chapter_ids_needed(s); create_new_ids = mkv_new_chapter_ids_needed(s);
for (unsigned i = 0; i < s->nb_chapters; i++) { for (unsigned i = 0; i < s->nb_chapters; i++) {
const AVChapter *c = s->chapters[i]; AVChapter *const c = s->chapters[i];
int64_t chapterstart = av_rescale_q(c->start, c->time_base, scale); int64_t chapterstart = av_rescale_q(c->start, c->time_base, scale);
int64_t chapterend = av_rescale_q(c->end, c->time_base, scale); int64_t chapterend = av_rescale_q(c->end, c->time_base, scale);
const AVDictionaryEntry *t; const AVDictionaryEntry *t;
@@ -2132,11 +2132,15 @@ static int mkv_write_chapters(AVFormatContext *s)
if (ret < 0) if (ret < 0)
goto fail; goto fail;
if (tags && mkv_check_tag(c->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID)) { if (tags) {
ret = mkv_write_tag(mkv, c->metadata, tags, NULL, ff_metadata_conv(&c->metadata, ff_mkv_metadata_conv, NULL);
MATROSKA_ID_TAGTARGETS_CHAPTERUID, uid);
if (ret < 0) if (mkv_check_tag(c->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID)) {
goto fail; ret = mkv_write_tag(mkv, c->metadata, tags, NULL,
MATROSKA_ID_TAGTARGETS_CHAPTERUID, uid);
if (ret < 0)
goto fail;
}
} }
} }
end_ebml_master(dyn_cp, editionentry); end_ebml_master(dyn_cp, editionentry);