[FFmpeg-cvslog] avcodec/cri: Factor read_len out

Michael Niedermayer git at videolan.org
Mon Aug 4 19:38:17 EEST 2025


ffmpeg | branch: release/6.1 | Michael Niedermayer <michael at niedermayer.cc> | Sun Aug  3 14:34:25 2025 +0200| [a8d3b7559a41883fd9b719a2d754ef2d3c21c5fc] | committer: Michael Niedermayer

avcodec/cri: Factor read_len out

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit d9bf3c141bb96dd285477278400b8349e9f964b0)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/cri.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavcodec/cri.c b/libavcodec/cri.c
index 012b67d313..7dea9c689c 100644
--- a/libavcodec/cri.c
+++ b/libavcodec/cri.c
@@ -221,10 +221,11 @@ static int cri_decode_frame(AVCodecContext *avctx, AVFrame *p,
             if (bytestream2_get_le32(gb) != 0)
                 return AVERROR_INVALIDDATA;
             break;
-        case 102:
-            bytestream2_get_buffer(gb, codec_name, FFMIN(length, sizeof(codec_name) - 1));
-            length -= FFMIN(length, sizeof(codec_name) - 1);
-            if (strncmp(codec_name, "cintel_craw", FFMIN(length, sizeof(codec_name) - 1)))
+        case 102:;
+            int read_len = FFMIN(length, sizeof(codec_name) - 1);
+            bytestream2_get_buffer(gb, codec_name, read_len))
+            length -= read_len;
+            if (strncmp(codec_name, "cintel_craw", read_len))
                 return AVERROR_INVALIDDATA;
             compressed = 1;
             goto skip;



More information about the ffmpeg-cvslog mailing list