This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 51ae4f443d94196423b66c681d4fa2dd64ea1070 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Sat Feb 21 15:54:07 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Mar 10 13:52:18 2026 +0100 avcodec/cbs_av1_syntax_template: Fix shadowing Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/cbs_av1_syntax_template.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 86b9a31614..f43c3a4de5 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -595,7 +595,7 @@ static int FUNC(tile_info)(CodedBitstreamContext *ctx, RWContext *rw, int max_tile_width_sb, max_tile_height_sb, max_tile_area_sb; int min_log2_tile_cols, max_log2_tile_cols, max_log2_tile_rows; int min_log2_tiles, min_log2_tile_rows; - int i, err; + int err; mi_cols = 2 * ((priv->frame_width + 7) >> 3); mi_rows = 2 * ((priv->frame_height + 7) >> 3); @@ -627,8 +627,8 @@ static int FUNC(tile_info)(CodedBitstreamContext *ctx, RWContext *rw, tile_width_sb = (sb_cols + (1 << current->tile_cols_log2) - 1) >> current->tile_cols_log2; - for (int off = 0, i = 0; off < sb_cols; off += tile_width_sb) - current->tile_start_col_sb[i++] = off; + for (int off = 0, j = 0; off < sb_cols; off += tile_width_sb) + current->tile_start_col_sb[j++] = off; current->tile_cols = (sb_cols + tile_width_sb - 1) / tile_width_sb; @@ -639,11 +639,12 @@ static int FUNC(tile_info)(CodedBitstreamContext *ctx, RWContext *rw, tile_height_sb = (sb_rows + (1 << current->tile_rows_log2) - 1) >> current->tile_rows_log2; - for (int off = 0, i = 0; off < sb_rows; off += tile_height_sb) - current->tile_start_row_sb[i++] = off; + for (int off = 0, j = 0; off < sb_rows; off += tile_height_sb) + current->tile_start_row_sb[j++] = off; current->tile_rows = (sb_rows + tile_height_sb - 1) / tile_height_sb; + int i; for (i = 0; i < current->tile_cols - 1; i++) infer(width_in_sbs_minus_1[i], tile_width_sb - 1); infer(width_in_sbs_minus_1[i], @@ -654,7 +655,7 @@ static int FUNC(tile_info)(CodedBitstreamContext *ctx, RWContext *rw, sb_rows - (current->tile_rows - 1) * tile_height_sb - 1); } else { - int widest_tile_sb, start_sb, size_sb, max_width, max_height; + int widest_tile_sb, start_sb, size_sb, max_width, max_height, i; widest_tile_sb = 0; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
