From patchwork Fri Jan 5 16:42:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45492 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1093:b0:199:52ba:a72d with SMTP id w19csp213103pze; Fri, 5 Jan 2024 08:43:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IGc8HNZ61XueifF8INZ3c7tubfu4Ivn9rLD/RgFX1hWdq4/fS8WTI5mMlFdC5sB2YvqQkrW X-Received: by 2002:a50:8e53:0:b0:552:7433:23ee with SMTP id 19-20020a508e53000000b00552743323eemr1372807edx.0.1704473026964; Fri, 05 Jan 2024 08:43:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704473026; cv=none; d=google.com; s=arc-20160816; b=nnYmV1Hozo6lWCQJ8crui8mDjFbayyQXDSAVFr05vjxOEmpyb3hlRp42LIgvKZmmv3 s+pMKalIP9ExTTxH9PYKte0s9J3PFzXQ7r/6FkSHgem2yH43BbwqG4gtgkBVSP6nOlAh HKsOwZOhm3LdXWrNbgKL7r0c3/VLGQ1YhPOOIt1/WUKKZO1s0mms+cnCqH3CBv58uryc Dmgqv6e8jFH0YrUfxPTPLsKicOyW1QbDEPf826s0a/vkcjIFNFH+cl32tPbRnoxiCD1C zq2t9bs3/SCdp5sNGZnXybSRJnqoO4zFPhHq9Rz8JvdjPJDXX6zJR0nHveicLkbgdkVt nJDw== 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=2JlXLI8FZIpDM9i5/fL7zzDRbSUIpx5jQWzqLrlE5gg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=nfOTYS7yVKoSUjDa/uHo6Ax3fLFUpjImVR+uHnDYU1dBtCdY6NSwUtMtxSGHejOQ/k XEUEwHfgFSsaI/F70Thc48Hp7vQoP2np6tNJxk+SBKyDalXH7hscY5/mPtwPCVmFCLZa CIOKCGY2O97ML1v7JcKmbW4XqaWVq+dkrFxzfMdlhSnr1VchUMvZodEPe/anKlVIbZyK J5PvI6EiWpak9V44Yd6L/G3Q0mId7BgNCVotlyvGX+4c9Sgd1Ys+woZYpQ3GBUMLh08e bJbmeTt7sEyc/Ka59WIMZsw6eAJ+l8AJidMdwMExjHXUAPoNScgoiQCtjLSP09UK2WJ5 hn4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=AI85TMe0; 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 a93-20020a509ee6000000b0055483a67223si779300edf.478.2024.01.05.08.43.46; Fri, 05 Jan 2024 08:43:46 -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; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=AI85TMe0; 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 1356C68CE14; Fri, 5 Jan 2024 18:43:09 +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 4769968CD40 for ; Fri, 5 Jan 2024 18:42: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=AI85TMe0; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id ED73F1F4 for ; Fri, 5 Jan 2024 17:42:55 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id ADiKPmOTIFvO for ; Fri, 5 Jan 2024 17:42:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1704472973; bh=O7d2+9v7vgVfy28/VjawlgHetV+CrMEfdWCC1IHw5i0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=AI85TMe0iC+T4BKXRXEx6p3fo0z6CVyMLEhXKuMsbrb/hn4t2xHAy6XCs16fi/na3 LjF/7HEngvDuR0f3Lj0lmXUvHestF3uKb/ZE5Z4CBgc3lLJNXZrfTi3bzpOm0v9Xo4 XxhaNA8dnsEMNSvVKmOzy96TEhZkNvOaUWsllV1oP1hza0EyVkP7KN02ckV4x0rEts bYoLwLZaKe+yUoLHcBN0Q+uoH8MnAHtUiD9bQmgEdixKeWBG47DYlvdKNqSfgfchBR nvPV1gWHeuA6p80KC37T0RIFyha0Ax9+dovtQcDEbovtqPojY3b/ev3cBhEDnSX7a1 TagAQS8yJH9rA== 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 E264D1579 for ; Fri, 5 Jan 2024 17:42:53 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 600B63A0582 for ; Fri, 5 Jan 2024 17:42:53 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Jan 2024 17:42:46 +0100 Message-ID: <20240105164251.28935-3-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240105164251.28935-1-anton@khirnov.net> References: <20240105164251.28935-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/8] fftools/ffmpeg_demux: do not set bitexact directly on the 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: vUJAok41fLfl Add it to decoder options instead, to be processed when opening the decoder. This way it won't be overridden by flags the user might be setting otherwise. --- fftools/ffmpeg_demux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 5d07b7153d..cacdc76a71 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1156,7 +1156,7 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) } if (o->bitexact) - ist->dec_ctx->flags |= AV_CODEC_FLAG_BITEXACT; + av_dict_set(&ist->decoder_opts, "flags", "+bitexact", AV_DICT_MULTIKEY); switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: