From 95132f6c0dcdaeb103a650323bf7cdf248145db3 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 9 Apr 2024 12:53:59 +0200 Subject: lavc/qsvenc: rename the skip_frame private option to qsv_skip_frame 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 c71bf2ed50..27c816844f 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -138,7 +138,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" }, \ -- cgit v1.2.3