[FFmpeg-devel] [PATCH] avutil/hwcontext_drm: fix mapping when dst format is unset (PR #20425)

[cgutman via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

PR #20425 opened by cgutman
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20425
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20425.patch

`av_hwframe_map()` is documented to work with a blank dst frame, but hwcontext_drm currently fails if `dst->format == AV_PIX_FMT_NONE`.


>From 37f02603b10b33bb5805a1f437680c261738df62 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 3 Sep 2025 20:21:51 -0500
Subject: [PATCH] avutil/hwcontext_drm: fix mapping when dst format is unset

av_hwframe_map() is documented to work with a blank dst frame, but
hwcontext_drm currently fails if dst->format == AV_PIX_FMT_NONE.

Signed-off-by: Cameron Gutman <aicommander@gmail.com>
---
 libavutil/hwcontext_drm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavutil/hwcontext_drm.c b/libavutil/hwcontext_drm.c
index 0847db09a0..565c02dead 100644
--- a/libavutil/hwcontext_drm.c
+++ b/libavutil/hwcontext_drm.c
@@ -288,7 +288,9 @@ static int drm_map_from(AVHWFramesContext *hwfc, AVFrame *dst,
 {
     int err;
 
-    if (hwfc->sw_format != dst->format)
+    if (dst->format == AV_PIX_FMT_NONE)
+        dst->format = hwfc->sw_format;
+    else if (hwfc->sw_format != dst->format)
         return AVERROR(ENOSYS);
 
     err = drm_map_frame(hwfc, dst, src, flags);
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org