[FFmpeg-cvslog] avcodec/hw_base_encode: Simplify EOF check

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul  5 02:21:47 2024 +0200| [1e888fb006daf1edb5d853de2f66a6caeb2dce13] | committer: Michael Niedermayer

avcodec/hw_base_encode: Simplify EOF check

Found while reviewing CID1608712 Explicit null dereferenced

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e888fb006daf1edb5d853de2f66a6caeb2dce13
---

 libavcodec/hw_base_encode.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/hw_base_encode.c b/libavcodec/hw_base_encode.c
index ecb4be6aa4..6d5632c298 100644
--- a/libavcodec/hw_base_encode.c
+++ b/libavcodec/hw_base_encode.c
@@ -546,11 +546,10 @@ start:
     }
 
     err = ff_encode_get_frame(avctx, frame);
-    if (err < 0 && err != AVERROR_EOF)
-        return err;
-
-    if (err == AVERROR_EOF)
+    if (err == AVERROR_EOF) {
         frame = NULL;
+    } else if (err < 0)
+        return err;
 
     err = hw_base_encode_send_frame(avctx, ctx, frame);
     if (err < 0)