[FFmpeg-devel] [PR] avcodec/amfdec: Return error upon error (PR #21381)

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

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

Found via an unused-variable warning from GCC.
Also just forward the error from amf_init_frames_context().

This bug has been introduced in
4479d28103acfc96266ec03b1061e2311edb541c.


>From 31352c1aa21855273b8ec0034337f8f698363499 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Mon, 5 Jan 2026 16:05:27 +0100
Subject: [PATCH] avcodec/amfdec: Return error upon error

Found via an unused-variable warning from GCC.
Also just forward the error from amf_init_frames_context().

This bug has been introduced in
4479d28103acfc96266ec03b1061e2311edb541c.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/amfdec.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/amfdec.c b/libavcodec/amfdec.c
index 6a0e0e441c..c178d5d912 100644
--- a/libavcodec/amfdec.c
+++ b/libavcodec/amfdec.c
@@ -644,9 +644,8 @@ static int amf_decode_frame(AVCodecContext *avctx, struct AVFrame *frame)
                 return AVERROR(EINVAL);
             }
             int ret = amf_init_frames_context(avctx, av_amf_to_av_format(format_var.int64Value), avctx->coded_width, avctx->coded_height);
-
-            if (res < 0)
-                return AVERROR(EINVAL);
+            if (ret < 0)
+                return ret;
         }else
             return AVERROR_EOF;
     } else {
-- 
2.49.1

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