From patchwork Tue Oct 18 12:36:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38782 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2082878pzb; Tue, 18 Oct 2022 05:39:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4z3bcvPF9DqstYDqh2/UwqqdODOFIgOHnA1ocd2kZw2wGffO5Bb3IUNW+yD5MEcU4GMHCc X-Received: by 2002:a17:906:6a16:b0:78d:e4b3:5365 with SMTP id qw22-20020a1709066a1600b0078de4b35365mr2306904ejc.107.1666096741042; Tue, 18 Oct 2022 05:39:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666096741; cv=none; d=google.com; s=arc-20160816; b=Y+qfRxUuC1xrb8mnPEZqcHKAJU3wDV8ge/1JpEzbFqoEeRemjxDCfWNbQBFJOneZAD 7mDV0X9w4s7c6AjAGQTPEy9YBXwfWyxFnZR6frq9i3XJOhQw+OPW6NvfZSuzttnhzJKW c38DIPLcf28AzZyqxs5DRcfdlGNkdg3QiQ3otmcFFy2ky82vlKybzx8q72q9IzPuQGgN Dga4h3YVHI5vgdYwST6tFnjazCSKxpvNEVdG3SoYJafkI4t7BqEzgWkJADvviNdqWnNC +LujEyclI4qmGlrBWB9IRnsMDmS030OzrwRTuqutNsRdbqRRXjFM8VHbekV7Oe3Bk3+p k+Yg== 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=nr9cTiTdocwcRVm5U5rhnc3Um1s95bNhtgm/cgwzgvc=; b=bNlQwJPEoq09BGYlCpHTtW3CAl5CB8/ZCdvYvcQahjNyZd4gulZoXh1wr5peJ3RLrI 58t3h4v56B+Q2EFMbP6ZsO0Z1VyJ2HmlQTS/i2R3iDqqUkrtbbPQUJcOt76ieEdFc3K4 K/rt5n8r9g6l9leg0iauKwNZ18IXZgg53ziraZjY4Inq7KPdg88urGVbeAG9sgy79pHv i9H2oG4vM0+g4sg/yo+5icVQkYkn6mgWW23vIHNCSRTrB2FcCRsjdocKKIu7sFAN/B+4 xrS/poJF/qhfdN4rFrG6B3cBv5Vs9E4wbBxjbErAq0W9aZo5jVUpH0vICHRbn9w/Qn0R 3ahQ== 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 f30-20020a50d55e000000b00457e08f77c2si10596567edj.272.2022.10.18.05.39.00; Tue, 18 Oct 2022 05:39:01 -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 95FC868BD3B; Tue, 18 Oct 2022 15:38:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC78668BCF7 for ; Tue, 18 Oct 2022 15:38:20 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 6664B2406CB for ; Tue, 18 Oct 2022 14:38:18 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id W-2Qm1scxTWr for ; Tue, 18 Oct 2022 14:38:18 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id B5E272406CA for ; Tue, 18 Oct 2022 14:38:13 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D1F9A3A1A2A for ; Tue, 18 Oct 2022 14:38:13 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 14:36:55 +0200 Message-Id: <20221018123701.25002-14-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221018123701.25002-1-anton@khirnov.net> References: <20221018123701.25002-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/20] fftools/ffmpeg_mux_init: drop a duplicated block in copy_metadata() 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: fOdS5+DEv9/c It does the same thing as the block right below it. --- fftools/ffmpeg_mux_init.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index a471bbf469..9e0164ba19 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1455,16 +1455,6 @@ static int copy_metadata(const char *outspec, const char *inspec, AVFormatContex parse_meta_type(inspec, &type_in, &idx_in, &istream_spec); parse_meta_type(outspec, &type_out, &idx_out, &ostream_spec); - if (!ic) { - if (type_out == 'g' || !*outspec) - o->metadata_global_manual = 1; - if (type_out == 's' || !*outspec) - o->metadata_streams_manual = 1; - if (type_out == 'c' || !*outspec) - o->metadata_chapters_manual = 1; - return 0; - } - if (type_in == 'g' || type_out == 'g') o->metadata_global_manual = 1; if (type_in == 's' || type_out == 's')