diff mbox series

[FFmpeg-devel,2/2] avcodec/cbs_h266_syntax_template: Remove set-but-unused variable

Message ID GV1P250MB0737DC17AC4F5EC7719869E98F2AA@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
State New
Headers show
Series [FFmpeg-devel,1/2] avcodec/cbs_h266_syntax_template: Don't use uninitialized value | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt June 30, 2023, 9:33 p.m. UTC 
Reported by Clang.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
Maybe this was meant to be used?

 libavcodec/cbs_h266_syntax_template.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Nuo Mi July 1, 2023, 2:34 p.m. UTC | #1 
On Sat, Jul 1, 2023 at 5:33 AM Andreas Rheinhardt <
andreas.rheinhardt@outlook.com> wrote:

> Reported by Clang.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> Maybe this was meant to be used?
>
>  libavcodec/cbs_h266_syntax_template.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/libavcodec/cbs_h266_syntax_template.c
> b/libavcodec/cbs_h266_syntax_template.c
> index 56e1205337..a329b7f9ed 100644
> --- a/libavcodec/cbs_h266_syntax_template.c
> +++ b/libavcodec/cbs_h266_syntax_template.c
> @@ -1711,7 +1711,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx,
> RWContext *rw,
>      pic_height_in_ctbs_y = AV_CEIL_RSHIFT(
>
>  current->pps_pic_height_in_luma_samples,(sps->sps_log2_ctu_size_minus5 +
> 5));
>      if (!current->pps_no_pic_partition_flag) {
> -        unsigned int exp_tile_width = 0, exp_tile_height = 0;
> +        unsigned int exp_tile_width = 0;
>          unsigned int unified_size, remaining_size;
>
>          u(2, pps_log2_ctu_size_minus5,
> @@ -1729,7 +1729,6 @@ static int FUNC(pps) (CodedBitstreamContext *ctx,
> RWContext *rw,
>          for (i = 0; i <= current->pps_num_exp_tile_rows_minus1; i++) {
>              ues(pps_tile_row_height_minus1[i],
>                  0, pic_height_in_ctbs_y - 1, 1, i);
> -            exp_tile_height += current->pps_tile_row_height_minus1[i] + 1;
>          }
>
>          remaining_size = pic_width_in_ctbs_y;
>
The original patch
https://ffmpeg.org/pipermail/ffmpeg-devel/2021-January/274535.html  is
"remaining_size
= pic_height_in_ctbs_y - exp_tile_height;"
Not sure we removed exp_tile_height.
diff mbox series

Patch

diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c
index 56e1205337..a329b7f9ed 100644
--- a/libavcodec/cbs_h266_syntax_template.c
+++ b/libavcodec/cbs_h266_syntax_template.c
@@ -1711,7 +1711,7 @@  static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
     pic_height_in_ctbs_y = AV_CEIL_RSHIFT(
         current->pps_pic_height_in_luma_samples,(sps->sps_log2_ctu_size_minus5 + 5));
     if (!current->pps_no_pic_partition_flag) {
-        unsigned int exp_tile_width = 0, exp_tile_height = 0;
+        unsigned int exp_tile_width = 0;
         unsigned int unified_size, remaining_size;
 
         u(2, pps_log2_ctu_size_minus5,
@@ -1729,7 +1729,6 @@  static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw,
         for (i = 0; i <= current->pps_num_exp_tile_rows_minus1; i++) {
             ues(pps_tile_row_height_minus1[i],
                 0, pic_height_in_ctbs_y - 1, 1, i);
-            exp_tile_height += current->pps_tile_row_height_minus1[i] + 1;
         }
 
         remaining_size = pic_width_in_ctbs_y;