From patchwork Wed Dec 14 11:58:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 39694 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp249072pzb; Wed, 14 Dec 2022 03:59:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf7xwQpNx1yDPP7xN6ktSPZmg8au/hhe6I+8Q298NSt8y7AvG+U1WC+AfResA2NBsiSRsuVq X-Received: by 2002:aa7:da85:0:b0:46c:b385:83d2 with SMTP id q5-20020aa7da85000000b0046cb38583d2mr27307091eds.0.1671019145710; Wed, 14 Dec 2022 03:59:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671019145; cv=none; d=google.com; s=arc-20160816; b=E1TwZuyPBItJ9dJ2AdITF5uXcAmCdXsuzmqWJY1Avgk9nk3u4O2HCB20nMGO0jozZg Xnzn9rb4XctPdotyf5SNU4qj30QDlnulJGOrv6z2t4ifio5yKn4R27FFQzeJRIjIGdQC DerU811vSGe1p/X80IBqbc9bqEguUoDexyZ2LEFDsYDQFyCIRr5hyQF5dSrw/adsJ7TH gswUk3T59AZxXRrSxPFitbttnYDv7kY5t0+q9TOIBZ7cKupTPLctYEhy+Gd05zMa9G9E CaHGiVevwyMl/3jDAGAlLhzGf7anFUMMAw8SGVbUNIcYoe0UvUl+jmP23s3LFVbfrVJi XpOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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; bh=5EGZSubyL6STV74lkJPWcVy+XCjerN5vNQUzo98RMSc=; b=HulVlhFaWUO7xvAKymxDPleGAbGlRL0jDmY3U8siBmu5M+V1Je+2+yfT4HzyzBE2ui D1nmHOn1wm/evETGxGJmNeSPCt5JFMCKAOToyFh5tKteTHTKmIm1ziGJ215G+rxVQWsS sqGXZ2oYEI393Jt6MeizYI610vrHvKgyRIsnYq18sNRkbsKoAOl5GyNtBjIe4cOzvdhD 2hHYFvllkqw9AzAXwmNwmb0mFu5iHREWvmJ5IrpJt9ypG9HiI0U9iL3sU25TfJ12GI9E ljbbjhqXTj6dIC8v4rRz26ByhlwMhdCIlphp7gssSIsZvJAGS0ThGoedeCyHG8dSNHMJ h9tg== 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 n26-20020aa7c45a000000b0046afd9f07b0si10500608edr.14.2022.12.14.03.59.05; Wed, 14 Dec 2022 03:59:05 -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; 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 384F568BAF0; Wed, 14 Dec 2022 13:59:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 193DC68BA32 for ; Wed, 14 Dec 2022 13:58:56 +0200 (EET) Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4NXDRH2r0Cz9sfC for ; Wed, 14 Dec 2022 12:58:51 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Dec 2022 17:28:19 +0530 Message-Id: <20221214115819.1886-1-ffmpeg@gyani.pro> In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] avformat/movenc: correct write_colr warning placement X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OOlQE8Wa9PBu The old warning is no longer applicable in the inner block after c5b20cfe19. --- libavformat/movenc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 7b00e65cdd..c427109609 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2330,10 +2330,11 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex av_stream_get_side_data(track->st, AV_PKT_DATA_ICC_PROFILE, NULL)) { int prefer_icc = mov->flags & FF_MOV_FLAG_PREFER_ICC || !has_color_info; mov_write_colr_tag(pb, track, prefer_icc); - } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { - av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n"); } + } else if (mov->flags & FF_MOV_FLAG_WRITE_COLR) { + av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4 or AVIF.\n"); } + if (track->mode == MODE_MOV || track->mode == MODE_MP4) { mov_write_clli_tag(pb, track); mov_write_mdcv_tag(pb, track);