From patchwork Thu May 23 09:03:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 49171 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp895419vqf; Thu, 23 May 2024 02:04:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWRApUYAyFnY66nioPVhGYNlqSAicfB9M3eiqVV0zFpMiYhOlo0Bhir7s0jIW1qXtq3iJ2Flh6D2TBvEQg0PDk5ZyPv/6Q0cfjA7w== X-Google-Smtp-Source: AGHT+IENofMUE628Y+yjacKF9KDFukaDxTbN1OQM2mwCoBIZv/bJ5j3CKbcSDMVFkw8zNipBgk66 X-Received: by 2002:a17:906:1608:b0:a59:b02a:90dc with SMTP id a640c23a62f3a-a6228198c19mr268434166b.54.1716455041107; Thu, 23 May 2024 02:04:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716455041; cv=none; d=google.com; s=arc-20160816; b=cIFgMG/A1QLylsh7roEj2tNHJBv9fi5AAL54dM7Kw33xEaA1jlahlg5qUtDzyzpAs8 7cf4o0srA4R2e6ViI2CQZjeRX5g2WVyeCXpfpHumKpRgjiiga4z3cun62c3PATOoDnQZ 4h5U69oicpeT/d7bPF8fad8h3aCIqogM8oOZtHVpHhNyk4AVm7YutrJRZivTOMFeonfI 7vnxI9ehYEYRbpYnWWyhh9t/tLsDX1CeLMoa7RLKrTzE0dks1Gudp67VoQoOO6q9djaW OCFYLz/4OBlPGrSEz8CkEOwkAtjHYGPbrNG7LEf8Jg0ssn7DpPoeguHJqh5GVTovBE5z f9Yg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=jOkPWPOMTfIOvfsTNps9/EOrERaRFd4KezyF6BS/O94=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=lIlSVf13qkEO3kUJXFMn1prZ2GPZNsaIGHDuJPqNGkXPV643sqVgoRxbYDkOp6MWEB 5AKx2aoh0rZ5q+tgKcg30LZheh1q6WJkSURTJ242xN0+2Ix1Ca42kXqT2KVKHjgvBLRf jaTl4URn8qrXWQU2tCwvsZyb7snQx8Q+Br3SU8Q0XG/NxcFXheomudkWLa7j4uPqkOGo j4fAONpQprdIwZ/p3hSt9blLbjYbNA2OeRaQrYMgxp5zz404Op7P+VpYLGWrXKxvM2RT ea0y1CrktBFq4cpiYPiVDGgllr5+zx4hj4ujg1uj4AzZO/Ujax8gqZBfd71Stjlf8whk A1bw==; 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=O69aKUSR; 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-a5a179461a2si1612148866b.106.2024.05.23.02.04.00; Thu, 23 May 2024 02:04:01 -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=O69aKUSR; 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 BD1BC68D428; Thu, 23 May 2024 12:03:56 +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 A478168D159 for ; Thu, 23 May 2024 12:03:49 +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=O69aKUSR; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id B0A0A4DC0 for ; Thu, 23 May 2024 11:03:48 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id qJtudfc0qRgo for ; Thu, 23 May 2024 11:03:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1716455027; bh=DOIEvka74dcH5QghY6jZSAluepbNH6gnhlZBGHkU9CA=; h=From:To:Subject:Date:From; b=O69aKUSR5Jcu8/R8eHQuUKoTgElRrbC0LTYxhoUSeaAglhog2scCPF7/5lMtt6Oyr DI8XnZ8jUVjm3BcBRF3TNxVLbNT7KX8bpIzcqtssB412OWD3VgXjWdn/bsOYp+gplL HP6t5LX9VQ0wqYAqp43joV95YglVggIL7UgeASCvbUMyW0fg1OJmUV8yrER3ZvEJO1 ibXLLWMZrw8TqtyS3b1tvenCXx+v1jkfOUaHuhf62nn6TIssMK0e6JDKUSdyXh+Nun oKkjf6eIO2G+OW8xeNyV3by+ykjIpXF2MRoFpbhYuxKJPAMDRvcUbkb1LkqN+FPX3l ByoUbQ3xlKB0w== 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 399764D58 for ; Thu, 23 May 2024 11:03:47 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id CC59D3A0231 for ; Thu, 23 May 2024 11:03:41 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 May 2024 11:03:36 +0200 Message-ID: <20240523090339.4228-1-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] lavc/qsvenc: rename the skip_frame private option to qsv_skip_frame 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: uWWmV0BKJW3+ It conflicts with the AVCodecContext option of the same name. --- libavcodec/qsvenc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index e3eb083746..d69dd19049 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -139,7 +139,7 @@ { "avbr_convergence", "Convergence of the AVBR ratecontrol (unit of 100 frames)", OFFSET(qsv.avbr_convergence), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, UINT16_MAX, VE }, #define QSV_OPTION_SKIP_FRAME \ -{ "skip_frame", "Allow frame skipping", OFFSET(qsv.skip_frame), AV_OPT_TYPE_INT, { .i64 = MFX_SKIPFRAME_NO_SKIP }, \ +{ "qsv_skip_frame", "Allow frame skipping", OFFSET(qsv.skip_frame), AV_OPT_TYPE_INT, { .i64 = MFX_SKIPFRAME_NO_SKIP }, \ MFX_SKIPFRAME_NO_SKIP, MFX_SKIPFRAME_BRC_ONLY, VE, .unit = "skip_frame" }, \ { "no_skip", "Frame skipping is disabled", \ 0, AV_OPT_TYPE_CONST, { .i64 = MFX_SKIPFRAME_NO_SKIP }, .flags = VE, .unit = "skip_frame" }, \