Message ID | 20240322103539.3948034-1-mypopy@gmail.com |
---|---|
State | Accepted |
Commit | bfbf0f4e82eff7fc6f15205b71e97322e7681dcb |
Headers | show |
Series | [FFmpeg-devel,1/2] lavc/vvc_parser: small cleanup for style | expand |
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 |
On Fri, Mar 22, 2024 at 6:36 PM Jun Zhao <mypopy@gmail.com> wrote: > From: Jun Zhao <mypopydev@gmail.com> > > small cleanup for style, redundant semicolons, goto labels, > in FFmpeg, we put goto labels at brace level. > Pushed this patch. Thanks, Jun > Signed-off-by: Jun Zhao <barryjzhao@tencent.com> > --- > libavcodec/vvc_parser.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c > index c661595e1e..245cb214c9 100644 > --- a/libavcodec/vvc_parser.c > +++ b/libavcodec/vvc_parser.c > @@ -173,7 +173,7 @@ static void set_parser_ctx(AVCodecParserContext *s, > AVCodecContext *avctx, > h266_sub_width_c[sps->sps_chroma_format_idc]; > s->height = pps->pps_pic_height_in_luma_samples - > (pps->pps_conf_win_top_offset + pps->pps_conf_win_bottom_offset) * > - h266_sub_height_c[sps->sps_chroma_format_idc];; > + h266_sub_height_c[sps->sps_chroma_format_idc]; > > avctx->profile = sps->profile_tier_level.general_profile_idc; > avctx->level = sps->profile_tier_level.general_level_idc; > @@ -317,7 +317,7 @@ static int get_pu_info(PuInfo *info, const > CodedBitstreamH266Context *h266, > } > info->pic_type = get_pict_type(pu); > return 0; > - error: > +error: > memset(info, 0, sizeof(*info)); > return ret; > } > @@ -329,7 +329,7 @@ static int append_au(AVPacket *pkt, const uint8_t > *buf, int buf_size) > if ((ret = av_grow_packet(pkt, buf_size)) < 0) > goto end; > memcpy(pkt->data + offset, buf, buf_size); > - end: > +end: > return ret; > } > > @@ -376,7 +376,7 @@ static int parse_nal_units(AVCodecParserContext *s, > const uint8_t *buf, > } else { > ret = 1; //not a completed au > } > - end: > +end: > ff_cbs_fragment_reset(pu); > return ret; > } > -- > 2.25.1 > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c index c661595e1e..245cb214c9 100644 --- a/libavcodec/vvc_parser.c +++ b/libavcodec/vvc_parser.c @@ -173,7 +173,7 @@ static void set_parser_ctx(AVCodecParserContext *s, AVCodecContext *avctx, h266_sub_width_c[sps->sps_chroma_format_idc]; s->height = pps->pps_pic_height_in_luma_samples - (pps->pps_conf_win_top_offset + pps->pps_conf_win_bottom_offset) * - h266_sub_height_c[sps->sps_chroma_format_idc];; + h266_sub_height_c[sps->sps_chroma_format_idc]; avctx->profile = sps->profile_tier_level.general_profile_idc; avctx->level = sps->profile_tier_level.general_level_idc; @@ -317,7 +317,7 @@ static int get_pu_info(PuInfo *info, const CodedBitstreamH266Context *h266, } info->pic_type = get_pict_type(pu); return 0; - error: +error: memset(info, 0, sizeof(*info)); return ret; } @@ -329,7 +329,7 @@ static int append_au(AVPacket *pkt, const uint8_t *buf, int buf_size) if ((ret = av_grow_packet(pkt, buf_size)) < 0) goto end; memcpy(pkt->data + offset, buf, buf_size); - end: +end: return ret; } @@ -376,7 +376,7 @@ static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, } else { ret = 1; //not a completed au } - end: +end: ff_cbs_fragment_reset(pu); return ret; }