Apply suggestions from code review

Co-authored-by: Jonas Karlman <jonas@kwiboo.se>
mpv-player · Aug 18, 2024 · 2207c4e · 2207c4e
1 parent fb8c6d0
commit 2207c4e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/meson_options.txt b/meson_options.txt
@@ -101,7 +101,7 @@ option('d3d-hwaccel', type: 'feature', value: 'auto', description: 'D3D11VA hwac
 option('d3d9-hwaccel', type: 'feature', value: 'auto', description: 'DXVA2 hwaccel')
 option('gl-dxinterop-d3d9', type: 'feature', value: 'auto', description: 'OpenGL/DirectX DXVA2 hwaccel')
 option('ios-gl', type: 'feature', value: 'auto', description: 'iOS OpenGL ES interop support')
-option('v4l2request', type: 'feature', value: 'disabled', description: 'V4L2 Request API hwaccel')
+option('v4l2request', type: 'feature', value: 'auto', description: 'V4L2 Request API hwaccel')
 option('videotoolbox-gl', type: 'feature', value: 'auto', description: 'Videotoolbox with OpenGL')
 option('videotoolbox-pl', type: 'feature', value: 'auto', description: 'Videotoolbox with libplacebo')
 option('vulkan-interop', type: 'feature', value: 'auto', description: 'Vulkan graphics interop')

diff --git a/video/out/hwdec/hwdec_drmprime.c b/video/out/hwdec/hwdec_drmprime.c
@@ -172,7 +172,7 @@ static int init_drmprime(struct ra_hwdec *hw)
     return post_init(hw);
 }
 
-#ifdef AV_HWDEVICE_TYPE_V4L2REQUEST
+#if HAVE_V4L2REQUEST
 static int init_v4l2request(struct ra_hwdec *hw)
 {
     struct priv_owner *p = hw->priv;
@@ -364,7 +364,7 @@ const struct ra_hwdec_driver ra_hwdec_drmprime = {
     },
 };
 
-#ifdef AV_HWDEVICE_TYPE_V4L2REQUEST
+#if HAVE_V4L2REQUEST
 const struct ra_hwdec_driver ra_hwdec_v4l2request = {
     .name = "v4l2request",
     .priv_size = sizeof(struct priv_owner),

diff --git a/video/out/hwdec/hwdec_drmprime_overlay.c b/video/out/hwdec/hwdec_drmprime_overlay.c
@@ -335,7 +335,7 @@ static int init_drmprime(struct ra_hwdec *hw)
     return -1;
 }
 
-#ifdef AV_HWDEVICE_TYPE_V4L2REQUEST
+#if HAVE_V4L2REQUEST
 static int init_v4l2request(struct ra_hwdec *hw)
 {
     struct priv *p = hw->priv;
@@ -383,7 +383,7 @@ const struct ra_hwdec_driver ra_hwdec_drmprime_overlay = {
     .uninit = uninit,
 };
 
-#ifdef AV_HWDEVICE_TYPE_V4L2REQUEST
+#if HAVE_V4L2REQUEST
 const struct ra_hwdec_driver ra_hwdec_v4l2request_overlay = {
     .name = "v4l2request-overlay",
     .priv_size = sizeof(struct priv),