From patchwork Fri Mar 22 20:28:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47324 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp163013pzb; Fri, 22 Mar 2024 13:29:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW6uzAthOuMQYcQTF26RJDeYinx3oizZ2/VImEqIWgo09plXhncep/kkLu/m12Cea+fx0WgOqTk3yYl7kzY6UQmvvwXn0xffFLYqw== X-Google-Smtp-Source: AGHT+IGptViUnKUKXlIGyFkaid+XUqbQIpbkbaVRpNHxSI5CzXHvJqF1fLf7pZ8rIFff4MPJO4Iz X-Received: by 2002:a17:906:2a42:b0:a47:3526:81a3 with SMTP id k2-20020a1709062a4200b00a47352681a3mr482513eje.48.1711139346129; Fri, 22 Mar 2024 13:29:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711139346; cv=none; d=google.com; s=arc-20160816; b=Pyoyl82ZTMi4SCkQOc9LQvl2raQmbxpgKL8oxrkkGUR/fbzG2X1XzHQ0+cBjIPkT3K uLvPxf62lTDEg4Zo8ubI9f03QSJqPf54o989dlFTBwpurxyP3AmFMhrM5935k8us9KgU 88fAcdmfsrKb3VeZpi3VW/yh3OaeElU/O/a87zVXcGultZ8dh16QGULVFRj0vLYxr9Fe s3sPCK1Bzc0eFmiePI32rJ9l1Z76G0vWt88C1clgzauX1pWCDZI7KgP2DnEfe4eymlzD uHw29FBBwTBR1/qQltJXXpFM5YyRiABSIogRl5+kZj30UT+39srTtSfwdj9AmC3WL5mb sTIQ== 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:dkim-signature:delivered-to; bh=yNl+zSRg01QfjPzl7fWmoKDkOHBM2QHhUKaslisuF0Y=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=oVRjrNmi6iGFeLEj9GmRsG2/e6jfAI3Rm1GRjdSntRBghm4JxNlW7EoHMVcsswm3tf fu7jSqelTrtJjFv6/jvliQb7LDgv4L2HepK9s+6MDDvLOPsRecG9xa9VCqUzRDyqcGF2 CC26WN7Q1szNCBSg6gyGUgSyQKgnOcuGY8ns2ykmO12J1i1gHqHA1lPf+Mp7bU2RK0q6 XoQEzUbN6MRwytc6Oc13EE29Y8cQ8Mbro82keQOxyNz2Ht/my8P5Byp/MPlOUpnpgV0I tlsZlr3RHWWNsxRTLoAdetTuR+AMoVn31HeYfBGCeFKJq6Rc1+1ma4ONpRB8QWx3HO4p oQ1A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=RXjHh4jr; 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 w26-20020a1709064a1a00b00a46d368ecedsi150895eju.974.2024.03.22.13.29.05; Fri, 22 Mar 2024 13:29:06 -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; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=RXjHh4jr; 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 373C768D4CE; Fri, 22 Mar 2024 22:29:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41DFE68D1FB for ; Fri, 22 Mar 2024 22:28:56 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=RXjHh4jr; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id ABD764496 for ; Fri, 22 Mar 2024 21:28:55 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id pzgLVI9HLm8K for ; Fri, 22 Mar 2024 21:28:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1711139334; bh=+vkyPUmys4q4otDcZyYPHOkWs+C5hx0I2745UxYOgC0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=RXjHh4jrBrDetXFKsrpBz66x4/idtnUP31HoGeVT711nyWjv3hEM1iYSWacpWYfTY t3rFwoE3Nitk7YHzbZktryyrlZ7Knc/tLLaPE+BVg4fzOOQVAqwMyi7d9g1bJEHfaw aRL0+s9N0Ac5fD3n/KM4vEbZQk19gSXOH2U9vH4apySPsIv+USWsPyYIGCL4wZ8noc qNGzZp0ENlokjRDfBDHCLfL0vSAnfWU9v/CVqCJSIEtVuJYtgJPxOPd78YdFwJUDzr bFORogrRhinVdtkr+MaoH/tkaO99eRyOWUUNDo9PZXKcCBGktmVKWklhNNFu9qPtFm M+y5mwg6DCY3g== 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 mail1.khirnov.net (Postfix) with ESMTPS id 3BC1C4D4D for ; Fri, 22 Mar 2024 21:28:54 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 346073A0582 for ; Fri, 22 Mar 2024 21:28:45 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 21:28:31 +0100 Message-ID: <20240322202841.31730-2-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240322202841.31730-1-anton@khirnov.net> References: <20240322202841.31730-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/12] fftools/ffmpeg_demux: only call filter_codec_opts() when we have a decoder 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: q5UfTM+PrLIH It is pointless otherwise, as decoder options will not be used. --- fftools/ffmpeg_demux.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 47312c9fe1..73b0eb0da1 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1329,10 +1329,12 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) if (ret < 0) return ret; - ret = filter_codec_opts(o->g->codec_opts, ist->st->codecpar->codec_id, - ic, st, ist->dec, &ds->decoder_opts); - if (ret < 0) - return ret; + if (ist->dec) { + ret = filter_codec_opts(o->g->codec_opts, ist->st->codecpar->codec_id, + ic, st, ist->dec, &ds->decoder_opts); + if (ret < 0) + return ret; + } ds->reinit_filters = -1; MATCH_PER_STREAM_OPT(reinit_filters, i, ds->reinit_filters, ic, st);