From patchwork Wed Oct 2 02:07:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ingo_Br=C3=BCckl?= X-Patchwork-Id: 51984 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cb8a:0:b0:48e:c0f8:d0de with SMTP id d10csp674048vqv; Tue, 1 Oct 2024 19:10:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX6B+G35g8pCNRTOryxoJLtOKTczihYlO1goRosaMBkxVFgWXrIUGqVIDquiC2UWpZdp4o68mfJrvCSHb7b6BwH@gmail.com X-Google-Smtp-Source: AGHT+IGbkNi5pl1BiKfQoJlEeHbO7IHHcylg6ZOmSKYhX+B7asYJMPiD1ddt9s+Kv8ttfR/bDT2R X-Received: by 2002:a17:907:7dab:b0:a90:136a:4de2 with SMTP id a640c23a62f3a-a98f82255a5mr46819466b.5.1727835026285; Tue, 01 Oct 2024 19:10:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727835026; cv=none; d=google.com; s=arc-20240605; b=bg9aVDrsh2z453fAqHtmwz8Q4LyK1KCZv0AJt34JwhcJfZAcrXpuO2ivUChZp3ejKb ltt5ErcLko+cPCSiug8YpE72LQoWhr/ppr+EVT8OFXddhWpMpN8IOqj1iQPh36eeEytm f3Mz9FeeLMnWu966qcX9GKLm6S65UgwHbUv/rC5nEmxFirzuGYNMuHqtHd/5Rs7kEOx7 Bpw9vfSj+O6dMjGUmZwRDQJJyct32yk9gG0Z4Ysw3aS16zZ3F4UydAAekc+zwrLwiKHD E5Z3ffjv6ywUkwagSw6yQmJASy6glFmM2985Ou+MaDDYCX6lk4gtY0pJpkMad6qymSkG 2dlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:date:to:from:message-id:dkim-signature:delivered-to; bh=IxJZfFl1Y74G5i/B7jrowPjCmOTrCQfGGVYVUsACELw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=QIReR8BQOE3HeTOIw3t9mTh1Qq9wnJpPXLtTFocYccmhLw0uv+rNGthXchKQuTGME0 xbIKiYzsk9MFfWBjbDOnVhBGkqYMSkLF4m8vdEkfRNgjyejAPpbctgFqDHosGd9o5SPS j4lTmCPku0goghw/K0pGhlhcf+QXI8Z0ECtLCP1RELBUyNB4CaLUM3hIWL0p0iMWB1FN KHyuAYOLZiroLP6krd0kFYm+Ygh2pBkdxyBnDmOyNCN1GUx1vgApbkdiP3wofT803KXy TuQWdAf9wfvZ8QCgEVoTW9mWSf8AhCf+9eXCstvJbGBPHNUK15geRF/BnLCGPxtNX2a3 ACYw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@oddnet.de header.s=DKIM001 header.b=bJuaA7J5; 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 a640c23a62f3a-a93c2a85b3dsi800276166b.922.2024.10.01.19.10.25; Tue, 01 Oct 2024 19:10:26 -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=@oddnet.de header.s=DKIM001 header.b=bJuaA7J5; 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 C38CC68D831; Wed, 2 Oct 2024 05:10:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp6.goneo.de (smtp6.goneo.de [85.220.129.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38C0B68CB40 for ; Wed, 2 Oct 2024 05:10:15 +0300 (EEST) Received: from hub1.goneo.de (hub1.goneo.de [IPv6:2001:1640:5::8:52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp6.goneo.de (Postfix) with ESMTPS id CD201240990 for ; Wed, 2 Oct 2024 04:10:14 +0200 (CEST) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id 348FB24065D for ; Wed, 2 Oct 2024 04:10:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oddnet.de; s=DKIM001; t=1727835013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=bzvqBA7zsjw+EaSJrPLUkGJU4hXcLdEHqHf3Uy56yUA=; b=bJuaA7J52PDp8Hsio8UjfKhR7vq2400qNKxfLQCEnzTL5snVqNwqvKb0o2ZpkoCvdOLotn KbOVqaMkhmvnJo3mz/qoINGNchZAuf/vd/bdhtr6c4OLmMp8QRVbf4Uqd7TPCGKfze+fBM w/iHTtSNl/Npp17CURmCk9YvYw2cRTPOeXAu9dl523AQARUp1SK5d4RDXJcjWdeVib1VvT cb8lsZ6AVFuFOm6nQJYBb6BB0NdEZty2WjfMCtgfFO9cye2JFPG4z0S/nnMtqt1o40qpkD GA7LK9GubyzOuWAdbpKBeOYPR8JbclXVcDHIyit+6TCcshy0DPHuxS9WFTufRQ== Received: from point.localnet (i59F735ED.versanet.de [89.247.53.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id 09C682405E4 for ; Wed, 2 Oct 2024 04:10:13 +0200 (CEST) Received: from ib by point.localnet with local (masqmail 0.2.30) id 1svooh-85P-00 for ; Wed, 02 Oct 2024 04:10:15 +0200 Message-ID: <66fcab6e.16d4c35a.bm000@oddnet.de> From: =?iso-8859-1?q?Ingo_Br=FCckl?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 02 Oct 2024 04:07:21 +0200 MIME-Version: 1.0 X-Mailer: blueMail/Linux 1.5 X-Rspamd-UID: ce5e82 X-Rspamd-UID: a9556f Subject: [FFmpeg-devel] [PATCH] avcodec/vaapi_encode: fix compilation without CONFIG_VAAPI_1 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: t3Xdi/7gftSf Sorry for the previous post. FFmpeg 7.1 as well as the latest development branch do not compile: In function 'vaapi_encode_h264_init_picture_params': libavcodec/vaapi_encode_h264.c:470:9: error: 'ctx' undeclared From 8e7d30b20d7ef62c4e637d650507672fc10bc5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= Date: Wed, 2 Oct 2024 03:25:37 +0200 Subject: [PATCH] avcodec/vaapi_encode: fix compilation without CONFIG_VAAPI_1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds VAAPIEncodeContext *ctx that has been removed in aa82340b0ccdde4955fba41b8de5e45348ecd11d. Signed-off-by: Ingo Brückl --- libavcodec/vaapi_encode_h264.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index fb87b68bec..cb0a7bd7ef 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -406,6 +406,7 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, FFHWBaseEncodePicture *pic) { FFHWBaseEncodeContext *base_ctx = avctx->priv_data; + VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeH264Context *priv = avctx->priv_data; VAAPIEncodePicture *vaapi_pic = pic->priv; VAAPIEncodeH264Picture *hpic = pic->codec_priv; -- 2.30.2