The branch, master has been updated
via 37f02603b10b33bb5805a1f437680c261738df62 (commit)
from 858aa6176b5320e8f648461194a80cfda766de5a (commit)
- Log -----------------------------------------------------------------
commit 37f02603b10b33bb5805a1f437680c261738df62
Author: Cameron Gutman <[email protected]>
AuthorDate: Wed Sep 3 20:21:51 2025 -0500
Commit: Cameron Gutman <[email protected]>
CommitDate: Wed Sep 3 20:21:51 2025 -0500
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 <[email protected]>
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);
-----------------------------------------------------------------------
Summary of changes:
libavutil/hwcontext_drm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
