This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 077864dfd6 avcodec/amf: fix hw_device_ctx handling
077864dfd6 is described below
commit 077864dfd6ff076a5254a6172c9da03dcce024a9
Author: Araz Iusubov <[email protected]>
AuthorDate: Fri Dec 5 16:32:46 2025 +0100
Commit: ArazIusubov <[email protected]>
CommitDate: Fri Dec 5 15:53:19 2025 +0000
avcodec/amf: fix hw_device_ctx handling
---
libavcodec/amfdec.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libavcodec/amfdec.c b/libavcodec/amfdec.c
index 1a2eb9392c..e1a5b71ee6 100644
--- a/libavcodec/amfdec.c
+++ b/libavcodec/amfdec.c
@@ -274,15 +274,16 @@ static int amf_decode_init(AVCodecContext *avctx)
if (!ctx->in_pkt)
return AVERROR(ENOMEM);
- if (avctx->hw_device_ctx && !avctx->hw_frames_ctx) {
+ if (avctx->hw_device_ctx) {
AVHWDeviceContext *hwdev_ctx;
hwdev_ctx = (AVHWDeviceContext*)avctx->hw_device_ctx->data;
if (hwdev_ctx->type == AV_HWDEVICE_TYPE_AMF)
{
ctx->device_ctx_ref = av_buffer_ref(avctx->hw_device_ctx);
- avctx->hw_frames_ctx = av_hwframe_ctx_alloc(avctx->hw_device_ctx);
-
- AMF_GOTO_FAIL_IF_FALSE(avctx, !!avctx->hw_frames_ctx,
AVERROR(ENOMEM), "av_hwframe_ctx_alloc failed\n");
+ if (!avctx->hw_frames_ctx) {
+ avctx->hw_frames_ctx =
av_hwframe_ctx_alloc(avctx->hw_device_ctx);
+ AMF_GOTO_FAIL_IF_FALSE(avctx, !!avctx->hw_frames_ctx,
AVERROR(ENOMEM), "av_hwframe_ctx_alloc failed\n");
+ }
} else {
ret = av_hwdevice_ctx_create_derived(&ctx->device_ctx_ref,
AV_HWDEVICE_TYPE_AMF, avctx->hw_device_ctx, 0);
AMF_GOTO_FAIL_IF_FALSE(avctx, ret == 0, ret, "Failed to create
derived AMF device context: %s\n", av_err2str(ret));
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
