diff mbox series

[FFmpeg-devel,1/4] avcodec/cbs_h266: Remove double ;

Message ID AS8P250MB0744C898991364E3E40D96548F25A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit e132fae1a56eab1327d5bf83f1eca3f2491cbfb3
Headers show
Series [FFmpeg-devel,1/4] avcodec/cbs_h266: Remove double ; | 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 29, 2023, 6:17 p.m. UTC
Fixes a warning from GCC when in pedantic mode:
"extra semicolon in struct or union specified"

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/cbs_h266.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

James Almer June 29, 2023, 6:18 p.m. UTC | #1
On 6/29/2023 3:17 PM, Andreas Rheinhardt wrote:
> Fixes a warning from GCC when in pedantic mode:
> "extra semicolon in struct or union specified"
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>   libavcodec/cbs_h266.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h
> index 8548e501c0..03dfd4a954 100644
> --- a/libavcodec/cbs_h266.h
> +++ b/libavcodec/cbs_h266.h
> @@ -80,7 +80,7 @@ typedef struct H266GeneralConstraintsInfo {
>   
>       /* inter */
>       uint8_t gci_no_ref_pic_resampling_constraint_flag;
> -    uint8_t gci_no_res_change_in_clvs_constraint_flag;;
> +    uint8_t gci_no_res_change_in_clvs_constraint_flag;
>       uint8_t gci_no_weighted_prediction_constraint_flag;
>       uint8_t gci_no_ref_wraparound_constraint_flag;
>       uint8_t gci_no_temporal_mvp_constraint_flag;
> @@ -211,7 +211,7 @@ typedef struct H266RawVUI {
>       uint8_t  vui_aspect_ratio_idc;
>   
>       uint16_t vui_sar_width;
> -    uint16_t vui_sar_height;;
> +    uint16_t vui_sar_height;
>   
>       uint8_t  vui_overscan_info_present_flag;
>       uint8_t  vui_overscan_appropriate_flag;

LGTM. This should also fix a compilation failure with msvc, which seems 
to be pretty strict about this.
http://fate.ffmpeg.org/report.cgi?time=20230629174305&slot=x86_64-msvc17-windows-native
Andreas Rheinhardt June 29, 2023, 6:20 p.m. UTC | #2
James Almer:
> On 6/29/2023 3:17 PM, Andreas Rheinhardt wrote:
>> Fixes a warning from GCC when in pedantic mode:
>> "extra semicolon in struct or union specified"
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>> ---
>>   libavcodec/cbs_h266.h | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h
>> index 8548e501c0..03dfd4a954 100644
>> --- a/libavcodec/cbs_h266.h
>> +++ b/libavcodec/cbs_h266.h
>> @@ -80,7 +80,7 @@ typedef struct H266GeneralConstraintsInfo {
>>         /* inter */
>>       uint8_t gci_no_ref_pic_resampling_constraint_flag;
>> -    uint8_t gci_no_res_change_in_clvs_constraint_flag;;
>> +    uint8_t gci_no_res_change_in_clvs_constraint_flag;
>>       uint8_t gci_no_weighted_prediction_constraint_flag;
>>       uint8_t gci_no_ref_wraparound_constraint_flag;
>>       uint8_t gci_no_temporal_mvp_constraint_flag;
>> @@ -211,7 +211,7 @@ typedef struct H266RawVUI {
>>       uint8_t  vui_aspect_ratio_idc;
>>         uint16_t vui_sar_width;
>> -    uint16_t vui_sar_height;;
>> +    uint16_t vui_sar_height;
>>         uint8_t  vui_overscan_info_present_flag;
>>       uint8_t  vui_overscan_appropriate_flag;
> 
> LGTM. This should also fix a compilation failure with msvc, which seems
> to be pretty strict about this.
> http://fate.ffmpeg.org/report.cgi?time=20230629174305&slot=x86_64-msvc17-windows-native

I'll amend the commit message and apply the patchset.

- Andreas
diff mbox series

Patch

diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h
index 8548e501c0..03dfd4a954 100644
--- a/libavcodec/cbs_h266.h
+++ b/libavcodec/cbs_h266.h
@@ -80,7 +80,7 @@  typedef struct H266GeneralConstraintsInfo {
 
     /* inter */
     uint8_t gci_no_ref_pic_resampling_constraint_flag;
-    uint8_t gci_no_res_change_in_clvs_constraint_flag;;
+    uint8_t gci_no_res_change_in_clvs_constraint_flag;
     uint8_t gci_no_weighted_prediction_constraint_flag;
     uint8_t gci_no_ref_wraparound_constraint_flag;
     uint8_t gci_no_temporal_mvp_constraint_flag;
@@ -211,7 +211,7 @@  typedef struct H266RawVUI {
     uint8_t  vui_aspect_ratio_idc;
 
     uint16_t vui_sar_width;
-    uint16_t vui_sar_height;;
+    uint16_t vui_sar_height;
 
     uint8_t  vui_overscan_info_present_flag;
     uint8_t  vui_overscan_appropriate_flag;