From patchwork Wed Aug 3 13:58:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37102 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp457791pzb; Wed, 3 Aug 2022 06:59:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vS5X/28yRM1A2AcczRADN99qJpOdhf0bA8b62sGiRvs2NTNRMTvY8aDFH7PqYOJSSZNgTc X-Received: by 2002:a05:6402:13c1:b0:43b:e330:9bbf with SMTP id a1-20020a05640213c100b0043be3309bbfmr25680446edx.417.1659535189592; Wed, 03 Aug 2022 06:59:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659535189; cv=none; d=google.com; s=arc-20160816; b=Iquu2/lk2n1lpi5is+AvKv2zTch6VKDpNm9pu9uxZXvfe1TOIINjttFvO0Kn/3SDtG k5VDYDGmGQJ/5JfLxKkkjAn9kkYz52LfnM3Tvl2FiJ6iOUZKcZVUHxagIvq4oeR2r9fI ihrB1qb1Pu/Rb0CWCzzkPA0IWqdzPLfJCY43PfNpmTRuJZTtUSX5OlGs9cPWRbhFnv6i x+0+U0V3LF88W1zfxNO3YtiFJVqftMYscni8Tl1UHZVP8b4AuGX5d3okG2M7EEpPYEeC 3M8HV7V8md3YQ71s/6Um7h2jTk6rUPMF/9ZVqpSwbbYHE4+Qwp7SsEpt5ArnqF8+ezxu 6gng== 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=nDzgVBh0SJCHfG4ZUHwvyoIR7rgS1U6Dj7bY5P1pWTU=; b=OylIgBvvw+v8yAU7n+1xpphS/0V+HR/1l9qYoWPUXjc7m4XlJlghTNN3PuDX7sWhN0 yTww3K3sR4XwqBwGpL35o87kElxbIB2pbZ8xaq2yNC3idjnSmHvKzblP0O+BbZtBMjD6 ayx+psE6PtrSZtzqLeFPGXqkh0fAktq3Z75AL5PU2O34HAKtbEcZ84FhgvDMtvBClzuB RSN6kH8iK/51SIEewgkW7fNiT52H2ZxoaXb9cAtmyievCxQFPSZXSfRBzbsB62Z1iawR TfgzDeuqWwxn+zLiHJBMdSbclb6WirO3KLWYSa6G1QMKFuXyb8EpbvxoAgex0KeTQrU9 uviw== 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 nc22-20020a1709071c1600b0072b66c5cdf0si2222476ejc.481.2022.08.03.06.59.49; Wed, 03 Aug 2022 06:59:49 -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 8BB5A68B8BF; Wed, 3 Aug 2022 16:59:07 +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 A9C9A68B7C2 for ; Wed, 3 Aug 2022 16:58:57 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 4232524017C for ; Wed, 3 Aug 2022 15:58:57 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id w80LGdEBQj2H for ; Wed, 3 Aug 2022 15:58:56 +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 BE362240506 for ; Wed, 3 Aug 2022 15:58:54 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id F2B0B3A0449; Wed, 3 Aug 2022 15:58:51 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Aug 2022 15:58:25 +0200 Message-Id: <20220803135844.16662-6-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220803135844.16662-1-anton@khirnov.net> References: <20220803135844.16662-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/25] fftools/ffmpeg_opt: drop redundant decoder selection 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: /qsEXelTC8yt A decoder is already selected above, in choose_decoder(). --- fftools/ffmpeg_opt.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index aa240107dc..12cde4b617 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1078,9 +1078,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: - if(!ist->dec) - ist->dec = avcodec_find_decoder(par->codec_id); - // avformat_find_stream_info() doesn't set this for us anymore. ist->dec_ctx->framerate = st->avg_frame_rate; @@ -1104,8 +1101,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) case AVMEDIA_TYPE_DATA: case AVMEDIA_TYPE_SUBTITLE: { char *canvas_size = NULL; - if(!ist->dec) - ist->dec = avcodec_find_decoder(par->codec_id); MATCH_PER_STREAM_OPT(fix_sub_duration, i, ist->fix_sub_duration, ic, st); MATCH_PER_STREAM_OPT(canvas_sizes, str, canvas_size, ic, st); if (canvas_size &&