From patchwork Tue Apr 3 06:05:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Timo_Ter=C3=A4s?= X-Patchwork-Id: 8299 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp3315853jad; Mon, 2 Apr 2018 23:05:30 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+slwtEvMnu3FU7bacwHGadTsschm2VlNuBQONsej0275MGme52ObMDTv2TLhaomCDY87LE X-Received: by 10.223.184.109 with SMTP id u42mr8078961wrf.3.1522735530823; Mon, 02 Apr 2018 23:05:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522735530; cv=none; d=google.com; s=arc-20160816; b=P7IciWPfayjPPtO8KtENPaEddGfm6Q5b4j4Oy6uRbVRUvrm62Ps47Ft9qcfG9Zfjcm UnNxowTnEC5rpcrrWoN+rX/SD38rhH2zhqalZWAnvA+8KNWdvtwStqsG8X5Mkojf4yBA 31gK4aFjNUKI+uOKND/HtQnZaXm6WA61T4ezLnPF+WnZX5CWWzJbgjKhoddVsFms3k+1 DniL0+vhYjYqLwhkcJICBS7cSodV6X5R9jO0eZWLfc1dqU5goWtwGj/JNy7cbhli9JzX Qkb2+K0SVfTFicmtHz6QDETtaw5XtPjgMpN92gw2dUh+zZK4Jh4bSjAHJUr1Le4kdZ0D mlWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=NAiv4/yWtrFLqXaUi33Ao5E6STe9JArNe05LBCAbMC0=; b=WSjPUCsEPyxQM3V1XaYsuJTjs6/HbasgVNnCyNZu7x0vy8qqccyC+2o+c6wxgtVtOp sbNZWaE53zN5y13u8LIgn1RvfT/DrjNzKCZlFqbaG3jR9vQXCZMmglv+edYC0hOkJTD8 dJ03Qr3Tp55+fO6DzangZc2v68jwliWu3dJa++aZy7T80283BQiB1krA99MYo7gVDACf 8eJhRjJVm8RdqoRmtMg6bXFPW6JJEBLtLNXZWfaCx2hREEL9a1CWe6xmI0MeKT5um2QO AH0iV9xsgbR1HYcmCW7sxti10jR8MbSFUCBHdk2AzcCcH9LM3PGYzx4R6xBSLx3iNnW3 KmbQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c7si2016481wmc.8.2018.04.02.23.05.30; Mon, 02 Apr 2018 23:05:30 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9215E689DB4; Tue, 3 Apr 2018 09:05:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C330068049B for ; Tue, 3 Apr 2018 09:05:01 +0300 (EEST) Received: by mail-wm0-f53.google.com with SMTP id r131so32113427wmb.2 for ; Mon, 02 Apr 2018 23:05:22 -0700 (PDT) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=MnLJHm06Zy4pHVh8Vb4T77INNne+A4fsXESIaCBfknw=; b=XrtByaxsDaLJ1WTFlVdUTsXo8p6RWFy7IlTLjQWsqziHXXNBKnJLbeNuoO18MBT+xx v26Roi71itHVNcSYI763NrfxO7Q9kcvgMiKFPyfIRlGJ4y9kfVKRXMca+i4a1GojXKVs Ix1/bZfO/9fN2h7ofpNq35BifKO0XICRyYXDuWg7QNOyqECazhYaYGuYlpjNjM80j5yh l9JJF6Wc0B28p3QBENV/rTo3m4aSmnQddgkKHLQMJVagfesga5anxwyHwMbXjZyD62Tt W+NvVfg3FVu3ecfBR1s5wf4cEysZ1vUhT2by3xvqrmS/bIkWleLQ2kp9ZgI5IFQAoE9u pdEA== X-Gm-Message-State: AElRT7EYEPJRf9XE9ASKw2CKs1P1uuex4B2cCJbJXiLjFRnaR15zsYbz X80iMLww0q4Hl6SdOUxM0YzxRbjA X-Received: by 10.46.99.216 with SMTP id s85mr7828332lje.105.1522735521742; Mon, 02 Apr 2018 23:05:21 -0700 (PDT) Received: from vostro.util.wtbts.net ([2001:1bc8:101:f402:e66f:13ff:fef3:8cd0]) by smtp.gmail.com with ESMTPSA id v4sm331901lji.15.2018.04.02.23.05.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 23:05:20 -0700 (PDT) From: =?UTF-8?q?Timo=20Ter=C3=A4s?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Apr 2018 09:05:18 +0300 Message-Id: <20180403060518.12368-1-timo.teras@iki.fi> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180402232424.GJ20131@michaelspb> References: <20180402232424.GJ20131@michaelspb> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/movenc: use correct iTunes copyright atom 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: =?UTF-8?q?Timo=20Ter=C3=A4s?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Support for writing copyright metadata was added in commit bed4fc54c9 for 3GP, MOV and iTunes metadata. 3GP and MOV cases are formally specified. However, iTunes format does not have specification, and it seems to have been assumed that it would use the same atom as MOV (both being Apple formats). However, Apple uses 'cprt' atom for iTunes metadata (do note that the iTunes 'cprt' encoding is generic iTunes ItemList atom, not the 3GP 'cprt' encoding. These are also inside different parent atoms). Most references trying to document iTunes atoms mention only the 'cprt' tag. See: - http://atomicparsley.sourceforge.net/mpeg-4files.html - http://mutagen.readthedocs.io/en/latest/api/mp4.html Same applies to other software supporting this tag. Most of them encode and decode only the 'cprt' atom. ffmpeg mov demuxer supports both atoms in this context. There are few pieces of other software that support similarly both 'cprt' and the incorrect '\251cpy' atom in this context. I believe they do it in order to read the ffmpeg encoded incorrect copyright atom. In light of the above this changes the copyright atom to 'cprt' as it seems to be supported univerally and is the correct atom to use. Signed-off-by: Timo Teräs --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 97327f739d..54f19c3a73 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3484,7 +3484,7 @@ static int mov_write_ilst_tag(AVIOContext *pb, MOVMuxContext *mov, } mov_write_string_metadata(s, pb, "\251cmt", "comment" , 1); mov_write_string_metadata(s, pb, "\251gen", "genre" , 1); - mov_write_string_metadata(s, pb, "\251cpy", "copyright", 1); + mov_write_string_metadata(s, pb, "cprt", "copyright", 1); mov_write_string_metadata(s, pb, "\251grp", "grouping" , 1); mov_write_string_metadata(s, pb, "\251lyr", "lyrics" , 1); mov_write_string_metadata(s, pb, "desc", "description",1);