From patchwork Tue May 19 10:45:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19772 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3A59144B23E for ; Tue, 19 May 2020 14:13:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0AEE068A8F8; Tue, 19 May 2020 14:13:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDFF6680A4B for ; Tue, 19 May 2020 14:13:43 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id y3so15469348wrt.1 for ; Tue, 19 May 2020 04:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wsAIsDx32dKG8MOsAnf3Fq8lj7arXEJR3XVflMT3epY=; b=IHoN5ZZ4YKlggtilGbcvQU82TRZSf6sdHOK58/qWyMat1kOILHirLx/M0Z8X805W88 R/wpKZiPSedR4yUq3mPkSES5sXu18cNzWmKMLkiGACpXF/n4qnhSOhqLp1wHBg1T5qu3 51SkS2+MCcWFKmv18q07xFm91S2QYYc0F+GNXeK7+tp+C626bX0XMXLSMA231dfOQImT OiW98dVCjZRgqAn+FTHWuL+Zodp5XEDBfcZeG322NTyhA67DZUo5zeBvVWzHbv/2E4Ao 2vWAi8vTNDoT5xBBv2orCQC9d/BSs/Y5MTBfkKGSlW+Qcj+OXTJZ8CPjMy2s45My70di Uq5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wsAIsDx32dKG8MOsAnf3Fq8lj7arXEJR3XVflMT3epY=; b=AR5t+ZOzgu6JdTwH3+ABowo29P70Iyk+CecUNbYUotYNx8GyLi2aTX27QrB+jnu5Lm eXUvlBlO2EXzaU/ggQRPXOka/G61LngzY/jMa/HaVyp/SRL0zCnuxj2PXaSkrNYCwmIL J1WscCqY7xrmlYD1wYRcc+CQp8E7cI8q5HcP5uLoPkO/c+qe6w1BWngMeCmIqQox3YKv Uf0JueAP5JyEcYqzDp5mo+XTbQtm5ThfAMDhivUTy4sZpQlPXAmjOHbNSXembqbFFnxV qwF0EGBsaE5n6whdOJIsFXkNebvIcBp3lMDCXI4weTwPj3BvFWgmyxdzAlp++adQNvap /BfQ== X-Gm-Message-State: AOAM533Igk8G5rf9oGerHBFgwJAzlqfSWqzS7ja2S3C7+yizLZaNxgwT OvPGLHv1KSpGhLCguBqsFDnvhiC8 X-Google-Smtp-Source: ABdhPJznNJKx/MRMUimJUcFwcbbJEapD+V+gcXO+uXV5LCmXz6DAdr0b7cm686B3IHb9LIdAOTugMA== X-Received: by 2002:a5d:5445:: with SMTP id w5mr24611105wrv.422.1589886490655; Tue, 19 May 2020 04:08:10 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id m23sm3511998wmg.45.2020.05.19.04.08.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 04:08:10 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 May 2020 12:45:57 +0200 Message-Id: <20200519104601.12817-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/aiffenc: Don't forget chapters X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 --- libavformat/aiffenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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', ' '));