From f183ae787a73f263706212dde151c1edddd6fb1c Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 4 Feb 2022 13:42:34 +0100 Subject: avcodec/cbs_jpeg: Remove redundant counter Use -1 as the position in ff_cbs_insert_unit_data() which implicitly reuses frag->nb_units as the counter. Also switch to a do-while-loop, as it is more natural than a for-loop now that the counter is gone. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_jpeg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c index 7d3e10fcc8..ae263ba038 100644 --- a/libavcodec/cbs_jpeg.c +++ b/libavcodec/cbs_jpeg.c @@ -110,7 +110,7 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx, AVBufferRef *data_ref; uint8_t *data; size_t data_size; - int unit, start, end, marker, next_start, next_marker; + int start, end, marker, next_start, next_marker; int err, i, j, length; if (frag->data_size < 4) { @@ -144,7 +144,7 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx, marker = frag->data[i]; start = i + 1; - for (unit = 0;; unit++) { + do { if (marker == JPEG_MARKER_EOI) { break; } else if (marker == JPEG_MARKER_SOS) { @@ -226,16 +226,14 @@ static int cbs_jpeg_split_fragment(CodedBitstreamContext *ctx, data_ref = frag->data_ref; } - err = ff_cbs_insert_unit_data(frag, unit, marker, + err = ff_cbs_insert_unit_data(frag, -1, marker, data, data_size, data_ref); if (err < 0) return err; - if (next_marker == -1) - break; marker = next_marker; start = next_start; - } + } while (next_marker != -1); return 0; } -- cgit v1.2.3