From 0230792bc81d4b7d11600a8d38fdda516ec5baf4 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 14 Mar 2024 01:31:06 +0100 Subject: [PATCH] avformat/aiffenc: Simplify padding tag Signed-off-by: Andreas Rheinhardt --- libavformat/aiffenc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 11a5b18d57..37aca41847 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -87,13 +87,15 @@ static void put_meta(AVFormatContext *s, const char *key, uint32_t id) AVIOContext *pb = s->pb; if (tag = av_dict_get(s->metadata, key, NULL, 0)) { - int size = strlen(tag->value); + size_t size = strlen(tag->value); + + // AIFF tags are zero-padded to an even length. + // So simply copy the terminating \0 if the length is odd. + size = FFALIGN(size, 2); avio_wl32(pb, id); - avio_wb32(pb, FFALIGN(size, 2)); + avio_wb32(pb, size); avio_write(pb, tag->value, size); - if (size & 1) - avio_w8(pb, 0); } }