From patchwork Tue Sep 24 07:09:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51782 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ad12:0:b0:48e:c0f8:d0de with SMTP id w18csp170813vqy; Tue, 24 Sep 2024 00:10:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUNFPoevRBp531vdY2k4HTb+uQ/ab+6CNzT7JebUCVhmE7BElqg7a3F0KIgQpx/g+lW1nV1Bkne1HJ6bZNQ7uUh@gmail.com X-Google-Smtp-Source: AGHT+IGW8127zh3xOw6ovpdIXWAnV6w8FDIGmvQRkiAJ8C3/2V1KHqbPJKoOEFBjjZfSmqHM+FlL X-Received: by 2002:a05:6402:3509:b0:5c5:cb7f:e56a with SMTP id 4fb4d7f45d1cf-5c5cdfa0523mr2126186a12.1.1727161855077; Tue, 24 Sep 2024 00:10:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727161855; cv=none; d=google.com; s=arc-20240605; b=O93Sc4iODlAFS20QyXrwgAdMebNMUzO1P3jWRI7p7b+/lewwrcNt53SE3J2lGW+/cp F+InjJimPaRIl6WgJpqU9+vVNRyIoVgTNfZRsfpw+d6AENo+IL9Z1aW6WyMEyN8BRXeQ 8MTNzY6OyCrZo5K598aIRrYVQSJqi6uCPK/WB5reCrekDdkFAgxGoYE1XrjHDXqYWRPm t/v0RUvn1qcwo1bkJ4zT1MZRnSK4ibxlD9in7ArIUeJiiKxAceSYf9p6dIcBnKR9Nw94 6uhf2F29e9JX/N/2KYNpMI/ON2DEXeAzJhlISuZ0Q9PbvPo/X2qUNaEi4R1ZR2soWtto /lUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=aGW37XagVlXZqlV6GiSqxYKMByU48r1LjyHuclQPnfA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=WMpTNLfELyHIVlvTTM04tXJZyXioLtIz1qYYLj+r3HdWuOX995/0muVuZfB4TYBzbE 5uZZR7XKYPgWz+kTR86Vb8OJ/1BuRD2u3gNgrnIpl4TS7CzO5qSjpmzOmX3rvsK7n0EQ GB6/0FJ6ivXaOGWrskZtcdg4sA87YSyZyFZy1AY8dWrUAp8+UEHlTVhbVByTlyH9DMr7 ME96+L6Uwju0Elnzp4dXH2LoEoPpy+pH7piNv8xA09iGpaNsE2vj4ECB/7xnM5h8Nu7c p78KE2AUSFGa3rTVvPKls4GuB0tcCUBpKGX+cFR8jbwsIGvZPke10NfBLS5aQRmZGY5b Kq/Q==; 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=EdtNUm63; 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 4fb4d7f45d1cf-5c5cf48a9a2si593547a12.76.2024.09.24.00.10.54; Tue, 24 Sep 2024 00:10:55 -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=EdtNUm63; 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 6882C68DAF5; Tue, 24 Sep 2024 10:10:26 +0300 (EEST) 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 5FC0968D799 for ; Tue, 24 Sep 2024 10:10:17 +0300 (EEST) 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=EdtNUm63; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id B031BEE8 for ; Tue, 24 Sep 2024 09:10:16 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id ueHfkSNZ4_o5 for ; Tue, 24 Sep 2024 09:10:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727161815; bh=jGC2BmdC4Kdmp5jsXfBwmcMtC/QxiE7wuAMl56K/Yjs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=EdtNUm63xPU7hAtAwFmCKTYXju9DRJ4rj24KjQ7xuQ3nk17o/cqxlW5tXYUOy0E3Y g32nhWzzaozx6edd9DZXyWNmVnMXnuJy+0gz6t9dnED+uWw7AL+Xb8/8/BKJ1jd4Op LyfxqaFfHUXu9fcMIrQkNJl7y2FaMzD2s5XkMpYk4nxWa/GEC4mSlAoSvSOSPAIhVu bu9Cp+oCf+FGyxqM/djY/zwQ5QgBqzc631lVD+pdQUiAjgVZANCdo9kaIxynLDpPuZ WEsapZXXgs7REeWfdfUtsYCLlqT5670DCdQuxKDhZz6yGECOE93qhuq9PQueVp5DdH /oEMrhvDdE1eQ== 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 58BCC4DEE for ; Tue, 24 Sep 2024 09:10:15 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 1DE4E3A0F6F for ; Tue, 24 Sep 2024 09:10:10 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Sep 2024 09:09:47 +0200 Message-ID: <20240924071000.11428-6-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240924071000.11428-1-anton@khirnov.net> References: <20240924071000.11428-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/13] fftools/ffmpeg_enc: remove unnecessary pointer references from enc_open() 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: GAsUmm1dZmRP --- fftools/ffmpeg_enc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 796849fdb9..499d6ea1f3 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -343,7 +343,7 @@ int enc_open(void *opaque, const AVFrame *frame) return ret; } - if ((ret = avcodec_open2(ost->enc_ctx, enc, NULL)) < 0) { + if ((ret = avcodec_open2(enc_ctx, enc, NULL)) < 0) { if (ret != AVERROR_EXPERIMENTAL) av_log(e, AV_LOG_ERROR, "Error while opening encoder - maybe " "incorrect parameters such as bit_rate, rate, width or height.\n"); @@ -352,11 +352,11 @@ int enc_open(void *opaque, const AVFrame *frame) e->opened = 1; - if (ost->enc_ctx->frame_size) - frame_samples = ost->enc_ctx->frame_size; + if (enc_ctx->frame_size) + frame_samples = enc_ctx->frame_size; - if (ost->enc_ctx->bit_rate && ost->enc_ctx->bit_rate < 1000 && - ost->enc_ctx->codec_id != AV_CODEC_ID_CODEC2 /* don't complain about 700 bit/s modes */) + if (enc_ctx->bit_rate && enc_ctx->bit_rate < 1000 && + enc_ctx->codec_id != AV_CODEC_ID_CODEC2 /* don't complain about 700 bit/s modes */) av_log(e, AV_LOG_WARNING, "The bitrate parameter is set too low." " It takes bits/s as argument, not kbits/s\n");