mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-10-19 18:03:17 +00:00
avcodec/cbs_av1: fix variable shadowing in cbs_av1_split_fragment()
header is previously declared as an int argument then
shadowed in the scope of the loop as a AV1RawOBUHeader.
Signed-off-by: Marth64 <marth64@proxyid.net>
(cherry picked from commit 8e8260aabf
)
This commit is contained in:
parent
0ccb070863
commit
3a375e3dcf
1 changed files with 5 additions and 5 deletions
|
@ -728,16 +728,16 @@ static int cbs_av1_split_fragment(CodedBitstreamContext *ctx,
|
||||||
}
|
}
|
||||||
|
|
||||||
while (size > 0) {
|
while (size > 0) {
|
||||||
AV1RawOBUHeader header;
|
AV1RawOBUHeader obu_header;
|
||||||
uint64_t obu_size;
|
uint64_t obu_size;
|
||||||
|
|
||||||
init_get_bits(&gbc, data, 8 * size);
|
init_get_bits(&gbc, data, 8 * size);
|
||||||
|
|
||||||
err = cbs_av1_read_obu_header(ctx, &gbc, &header);
|
err = cbs_av1_read_obu_header(ctx, &gbc, &obu_header);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
if (header.obu_has_size_field) {
|
if (obu_header.obu_has_size_field) {
|
||||||
if (get_bits_left(&gbc) < 8) {
|
if (get_bits_left(&gbc) < 8) {
|
||||||
av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU: fragment "
|
av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU: fragment "
|
||||||
"too short (%"SIZE_SPECIFIER" bytes).\n", size);
|
"too short (%"SIZE_SPECIFIER" bytes).\n", size);
|
||||||
|
@ -748,7 +748,7 @@ static int cbs_av1_split_fragment(CodedBitstreamContext *ctx,
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
} else
|
} else
|
||||||
obu_size = size - 1 - header.obu_extension_flag;
|
obu_size = size - 1 - obu_header.obu_extension_flag;
|
||||||
|
|
||||||
pos = get_bits_count(&gbc);
|
pos = get_bits_count(&gbc);
|
||||||
av_assert0(pos % 8 == 0 && pos / 8 <= size);
|
av_assert0(pos % 8 == 0 && pos / 8 <= size);
|
||||||
|
@ -763,7 +763,7 @@ static int cbs_av1_split_fragment(CodedBitstreamContext *ctx,
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = ff_cbs_append_unit_data(frag, header.obu_type,
|
err = ff_cbs_append_unit_data(frag, obu_header.obu_type,
|
||||||
data, obu_length, frag->data_ref);
|
data, obu_length, frag->data_ref);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue