aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-05-19 06:10:27 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-05-25 05:38:15 +0200
commit1ebbb493cced1af3fc891618e2573c7bc5ed7e70 (patch)
tree701a45cdbeea3d3d7ddb14d1e221151d368bb5d5
parentc7c8f141ebd95b73baebf4b5013d3c6389cbe2c6 (diff)
downloadffmpeg-1ebbb493cced1af3fc891618e2573c7bc5ed7e70.tar.gz
avformat/aiffenc: Don't forget chapters
If the write_id3v2 option is set, the aiff muxer would write id3v2 tags if there is global metadata or if there are attached pics to write. Chapters are ignored in this check that precedes writing id3v2 tags. Yet 47ac344970f1d6ef149c4b8a883b68cdb15112c2 added support for writing chapters as id3v2 tags, so one should check for the existence of chapters, too; otherwise the chapters would only be written in case there is global metadata or an attached pic. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavformat/aiffenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index 0145596bec..88c45df334 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -49,7 +49,7 @@ static int put_id3v2_tags(AVFormatContext *s, AIFFOutputContext *aiff)
AVIOContext *pb = s->pb;
AVPacketList *pict_list = aiff->pict_list;
- if (!s->metadata && !aiff->pict_list)
+ if (!s->metadata && !s->nb_chapters && !aiff->pict_list)
return 0;
avio_wl32(pb, MKTAG('I', 'D', '3', ' '));