From patchwork Wed Apr 3 19:44:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 47767 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp622238pzb; Wed, 3 Apr 2024 12:44:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJTU3pyFhUGYi8n+bTZn++CG20bfKzYwm8OpWvhrgXvaZ15lZA75m/M9zuRduWFpk8uE5ayS7g02+KdRx4zUn4/7IZdBP50cieEg== X-Google-Smtp-Source: AGHT+IH26vLPMb5fyC+Ii2w9ty1n+uqp2/ZhNGxPNBCtPqRs4lUvoRjlWdmr0Mgzn40rAviTbZEl X-Received: by 2002:a50:d5da:0:b0:568:3362:ccd1 with SMTP id g26-20020a50d5da000000b005683362ccd1mr381100edj.1.1712173453443; Wed, 03 Apr 2024 12:44:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712173453; cv=none; d=google.com; s=arc-20160816; b=tl1CQQiuw+QUYKd1W/Io2FkWNeFnoeSNiOuJzAJNIXe2lKjIlfv5JJGIlLRK+50DSo co92s5wL3BHXPeTKS/tspHKF/z38eV0vlUEd2DsT7OitMsYnsK4yHkoEIKYX41qOW4FM G4/DHp00mD2s0pSHRUzouecRG/Sa8M4TqlDawancwSTW6Qu1mUWWo0koNJACvWqYg1Us DsXQT4acNQtPbeXuJGGmuRK5WO6fQ5DuAUwRyOhbqSuNUhm6aCA2B2U4Y5JD26bu1D2F e2FIoUyePCDzeAe6cMZVtNGj8+NFgsLV0xaq7myjRcWSh7dd9o+HPViXefXNEHSD5fsc 04uw== 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:from:to:content-language:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=Xy12qt4AZlvJXFl5rlfqhM0DB58QU9FhgXi6DDwPebQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=cjZgD++qj6m5YMLs9V1aYTmY8ZwQHNDZ1TLXftKC+Lmp9S6i32vIRRyaW0Zz3004Hn G1EyFH/ZZdRDeEDg1xZlA2YZxCSpOtKp0frfjkXo0XNbQ708JT6aaN4RFLISJPwdYBmj UbhGmhnMo6fs04w5vyqcl6RIjnv6BiinJA6d5WuY3yzhbI4fZSPkshhbvdAN7LdERESQ XbXQNFsdfgQXBNNrb8lCyRpjqmOjiTBQeZAvP88c6Ecvr7kHPKqpO4UGRUWaRW4Jo5S/ N5UZkHDZcSZ3NyCF+KY+ZIm0RZwopCrzyZVLDy45oUF7LamhW3imhle2YDWKUCaV9HJM bBvA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20230601.gappssmtp.com header.s=20230601 header.b=XfAkyPxa; 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 s30-20020a50ab1e000000b0056df7e4db42si1504875edc.403.2024.04.03.12.44.12; Wed, 03 Apr 2024 12:44:13 -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=@jkqxz-net.20230601.gappssmtp.com header.s=20230601 header.b=XfAkyPxa; 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 E7A0C68D128; Wed, 3 Apr 2024 22:44:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A6F468D0EA for ; Wed, 3 Apr 2024 22:44:04 +0300 (EEST) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-34391544c46so144649f8f.0 for ; Wed, 03 Apr 2024 12:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1712173444; x=1712778244; darn=ffmpeg.org; h=content-transfer-encoding:subject:from:to:content-language :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=rNlB8tGiLW4KX5mEWnMAo+nbJCtfHpiKgd6xmbKIdSM=; b=XfAkyPxapnj/hJMC8f8LZlNKBfesp8gW/qmqWNqE4rOIDuYOrGFix4aGKmvj+upKMT sILT0/TsdW25KOdU7m8Pt9k8TW7CrkXnspwy5gWx1N82+HQeHIjb6Y/ShQ2Fob/0VO8w wjS9yhOc6tT0kujLm9cw8Ud9QaBHchD3FLdpmVCrE14zxweNGexvInrFMlkLoLRwMxBU RgL6YiC+2y50UV1foE/Zz8zpY/2WAxAwY+0//EI+7Xw21jbckoavFV/e3SKr/52igvjg EXQO1dq/SpFuYXJppmYh8LN3ROntgv9mgHXKYCBifob9ioiR6Dn7qiOcl8KczoEjkT1h vs8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712173444; x=1712778244; h=content-transfer-encoding:subject:from:to:content-language :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=rNlB8tGiLW4KX5mEWnMAo+nbJCtfHpiKgd6xmbKIdSM=; b=I5zJfsjYVuUj+YCbkkir4chCD44PMz7k+e448RTCW7GjWmeyAGgRHpKGxmZwkf2KWe 7bTkLuVGp6iMk8y7pJrBkqP5xiE3BL+W/Q6RENHTFjEM4IJmWp4gaZH6z6YMt9yD5+Bc xCwVxDTuAg9H8xyo2rVmHBp2tcs3OZ04/vi0tlnKk/m37XJpm5yaJ9EVGH72+Juyv4nR W8D6Qmtqqh2W40vZWzbZs6LdrevFYQO+d4crd69Sth6muH0v0EuNo+Xt9aA9kd1sWsI3 RPQtsKSCgSi9HFJvBfTihsZgRkK+m9jCzdGXuzjvLaC53g7OxiYG8iQl4OXWAg5xjohS Nqsw== X-Gm-Message-State: AOJu0YyWJbnVbO3Kooq3M8/2eMVIW1VRf2tTnpGBjMn5BcUc819Z4Wpp KTMVs2HWOozAFB/2kbLW8/7ijwheqlF6Vt1hchNd4EWIWbuNsKY5kCBplNuZ+aC8R2PVZ3FMOQl m X-Received: by 2002:adf:b1d2:0:b0:343:4b38:6659 with SMTP id r18-20020adfb1d2000000b003434b386659mr330689wra.53.1712173443708; Wed, 03 Apr 2024 12:44:03 -0700 (PDT) Received: from [192.168.0.15] (cpc92302-cmbg19-2-0-cust1183.5-4.cable.virginm.net. [82.1.212.160]) by smtp.gmail.com with ESMTPSA id f10-20020a0560001b0a00b00341dbb4a3a7sm17931399wrz.86.2024.04.03.12.44.03 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Apr 2024 12:44:03 -0700 (PDT) Message-ID: <15056f44-06c8-40a1-bb78-db3e66b2ee86@jkqxz.net> Date: Wed, 3 Apr 2024 20:44:29 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: FFmpeg development discussions and patches From: Mark Thompson Subject: [FFmpeg-devel] [PATCH 1/4] lavu: Remove libva 1.x support 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: 9U5NXJsaEKAQ libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. --- libavutil/hwcontext_vaapi.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 56d03aa4cd..bc82ab31e6 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1637,7 +1637,6 @@ static void vaapi_device_free(AVHWDeviceContext *ctx) av_freep(&priv); } -#if CONFIG_VAAPI_1 static void vaapi_device_log_error(void *context, const char *message) { AVHWDeviceContext *ctx = context; @@ -1651,7 +1650,6 @@ static void vaapi_device_log_info(void *context, const char *message) av_log(ctx, AV_LOG_VERBOSE, "libva: %s", message); } -#endif static int vaapi_device_connect(AVHWDeviceContext *ctx, VADisplay display) @@ -1660,10 +1658,8 @@ static int vaapi_device_connect(AVHWDeviceContext *ctx, int major, minor; VAStatus vas; -#if CONFIG_VAAPI_1 vaSetErrorCallback(display, &vaapi_device_log_error, ctx); vaSetInfoCallback (display, &vaapi_device_log_info, ctx); -#endif hwctx->display = display;