diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-04 13:16:06 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-08 04:00:30 +0100 |
| commit | d64e27f5213001c86c8374f373d0513fe5d2e251 (patch) | |
| tree | 7efa1690858d7ff3c1453f7f8576da042bc2f021 /libavcodec/cbs_mpeg2.c | |
| parent | 2f299c0b8b4ab1b549b25ab48aa2adbc9f8718ea (diff) | |
| download | ffmpeg-d64e27f5213001c86c8374f373d0513fe5d2e251.tar.gz | |
avcodec/cbs_mpeg2: 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 <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/cbs_mpeg2.c')
| -rw-r--r-- | libavcodec/cbs_mpeg2.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 26400f279f..4395bbf047 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -148,7 +148,8 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, CodedBitstreamUnitType unit_type; uint32_t start_code = -1; size_t unit_size; - int err, i, final = 0; + int err; + int final = 0; start = avpriv_find_start_code(frag->data, frag->data + frag->data_size, &start_code); @@ -157,7 +158,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, return AVERROR_INVALIDDATA; } - for (i = 0;; i++) { + do { unit_type = start_code & 0xff; if (start == frag->data + frag->data_size) { @@ -185,16 +186,13 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, final = 1; } - err = ff_cbs_insert_unit_data(frag, i, unit_type, (uint8_t*)start, + err = ff_cbs_insert_unit_data(frag, -1, unit_type, (uint8_t*)start, unit_size, frag->data_ref); if (err < 0) return err; - if (final) - break; - start = end; - } + } while (!final); return 0; } |