From patchwork Fri Feb 10 21:03:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 2489 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp693874vsb; Fri, 10 Feb 2017 13:03:58 -0800 (PST) X-Received: by 10.223.135.201 with SMTP id c9mr9197757wrc.139.1486760638224; Fri, 10 Feb 2017 13:03:58 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v130si2638954wmd.161.2017.02.10.13.03.53; Fri, 10 Feb 2017 13:03:58 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9025689D9E; Fri, 10 Feb 2017 23:03:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4552689D6B for ; Fri, 10 Feb 2017 23:03:41 +0200 (EET) Received: by mail-qk0-f193.google.com with SMTP id e1so6721461qkh.1 for ; Fri, 10 Feb 2017 13:03:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=qS8rsmtBsXIJXXlHZXaNH6ZOTkswPh1EVVmepv4Eze4=; b=nn6qI5gq3XPWruMUN4KsoGAByZ+dIsDj79iTBahbA3EaU1JMIPpBfLVUuAWxqGkcWM WOziqX8Lj4dVXsmtvVpWz1+K4Ng56iqcWmN5rP0exC/4NpGRCKCz1+Xp35DgBPdo/yt7 +xBLXZDMU5fZCjDXJxxZLlso4qYW92s9ZycTdcXp1nbk+8+405+KKecLRxtGLfeQG2PI 90DwNGJHFh37dd7f1diYbSlwW+1INQx3VrlWWmf259M0p3YAFKL/gM5hmsidGJIov4fo LKWiw5AIwNnYU6uVfVwkfBAszGFSNca3Zbi1Da4Uejomttv4BqpAWaBrQ5Y85iWJyOc/ jRDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=qS8rsmtBsXIJXXlHZXaNH6ZOTkswPh1EVVmepv4Eze4=; b=osAv4OzP0Gr9ef3awE8MgEYy/UL1MFy0/Q06dxgSZ5O/w8ujZQIv1rrBL7a8wTNVx9 e5HhXGX47RXMEt5LH8hZ1KXmLHYIaPMfES2XarzOsOeFcUBjFQ/J2dmsovdlRvvdL1us zsJ1iFCRikO0Mi03PlIVVDLCzmIYLWna6gZBfDr77HIU8tRGgxKhFtEsuKfmrYCXscHG R3Cv2SqEs3ZZX2yW6vQKgieFx/sS08KaL/77FTYssTWDNMAefooCN4EVujq9ikOJn5/o djqzeE5kXBDazEbHb9ZzxvGpIyhX5uwQFY6DexJKqSkt4Q1JW7RRZw4ekkaP6zzgbTzY McOg== X-Gm-Message-State: AMke39mU5pB/1G5cUjU3jZOBYvcg3Ec+9OgjZEspUfrzyWpZtg7ZZ1I9W1aiSeaM3P4SIA== X-Received: by 10.55.151.7 with SMTP id z7mr10953954qkd.316.1486760624486; Fri, 10 Feb 2017 13:03:44 -0800 (PST) Received: from localhost.localdomain ([181.231.87.206]) by smtp.gmail.com with ESMTPSA id c140sm2406198qke.25.2017.02.10.13.03.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Feb 2017 13:03:43 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Feb 2017 18:03:31 -0300 Message-Id: <20170210210331.6944-1-jamrial@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170210175049.5660-1-jamrial@gmail.com> References: <20170210175049.5660-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avformat/apetag: reorder some code to improve readability 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This way it's clear the size field accounts for the footer length plus every tag entry, but not the header. Signed-off-by: James Almer --- libavformat/apetag.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/apetag.c b/libavformat/apetag.c index b23f8cdd1f..cdc602e1a9 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -192,10 +192,6 @@ int ff_ape_write_tag(AVFormatContext *s) if ((ret = avio_open_dyn_buf(&dyn_bc)) < 0) goto end; - // flags - avio_wl32(dyn_bc, APE_TAG_FLAG_CONTAINS_HEADER | APE_TAG_FLAG_IS_HEADER); - ffio_fill(dyn_bc, 0, 8); // reserved - ff_standardize_creation_time(s); while ((e = av_dict_get(s->metadata, "", e, AV_DICT_IGNORE_SUFFIX))) { int val_len; @@ -218,7 +214,7 @@ int ff_ape_write_tag(AVFormatContext *s) size = avio_close_dyn_buf(dyn_bc, &dyn_buf); if (size <= 0) goto end; - size += 20; + size += APE_TAG_FOOTER_BYTES; // header avio_write(s->pb, "APETAGEX", 8); // id @@ -226,7 +222,11 @@ int ff_ape_write_tag(AVFormatContext *s) avio_wl32(s->pb, size); avio_wl32(s->pb, count); - avio_write(s->pb, dyn_buf, size - 20); + // flags + avio_wl32(s->pb, APE_TAG_FLAG_CONTAINS_HEADER | APE_TAG_FLAG_IS_HEADER); + ffio_fill(s->pb, 0, 8); // reserved + + avio_write(s->pb, dyn_buf, size - APE_TAG_FOOTER_BYTES); // footer avio_write(s->pb, "APETAGEX", 8); // id