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 1461dfcde7 avcodec/amfdec: Check correct value, return error upon error
1461dfcde7 is described below

commit 1461dfcde719075db447e25df91c62cf511e87f5
Author:     Andreas Rheinhardt <[email protected]>
AuthorDate: Mon Jan 5 16:05:27 2026 +0100
Commit:     Andreas Rheinhardt <[email protected]>
CommitDate: Wed Jan 7 17:32:06 2026 +0100

    avcodec/amfdec: Check correct value, 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.
    
    Reviewed-by: Jan Ekström <[email protected]>
    Reviewed-by: Mikhail Mironov <[email protected]>
    Signed-off-by: Andreas Rheinhardt <[email protected]>
---
 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 {

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to