diff options
| author | Lukas Stabe <lukas@stabe.de> | 2017-10-05 03:34:19 +0200 |
|---|---|---|
| committer | wm4 <nfxjfg@googlemail.com> | 2017-10-05 17:10:23 +0200 |
| commit | 1fd80106be3dca9fa0ea13fb364c8d221bd27c15 (patch) | |
| tree | e820d55b354b49746bbf46f62860de7d20ed8d19 /libavformat/iff.c | |
| parent | cafd9d66ed9e1bad4ae579a3935f7af57a567a51 (diff) | |
| download | ffmpeg-1fd80106be3dca9fa0ea13fb364c8d221bd27c15.tar.gz | |
avformat: fix id3 chapters
These changes store id3 chapter data in ID3v2ExtraMeta and introduce
ff_id3v2_parse_chapters to parse them into the format context if needed.
Encoders using ff_id3v2_read, which previously parsed chapters into the
format context automatically, were adjusted to call
ff_id3v2_parse_chapters.
Signed-off-by: wm4 <nfxjfg@googlemail.com>
Diffstat (limited to 'libavformat/iff.c')
| -rw-r--r-- | libavformat/iff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/iff.c b/libavformat/iff.c index 6a09eb0e31..4cf17f6e1a 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -312,7 +312,8 @@ static int parse_dsd_prop(AVFormatContext *s, AVStream *st, uint64_t eof) id3v2_extra_meta = NULL; ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, size); if (id3v2_extra_meta) { - if ((ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0) { + if ((ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0 || + (ret = ff_id3v2_parse_chapters(s, &id3v2_extra_meta)) < 0) { ff_id3v2_free_extra_meta(&id3v2_extra_meta); return ret; } |