[FFmpeg-devel] [PATCH 3/4] Remove redundant ;

[Fu, Linjie]

Hi,

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces at ffmpeg.org> On Behalf Of
> Michael Niedermayer
> Sent: Sunday, December 8, 2019 07:20
> To: FFmpeg development discussions and patches <ffmpeg-
> devel at ffmpeg.org>
> Subject: [FFmpeg-devel] [PATCH 3/4] Remove redundant ;
> 
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavfilter/af_axcorrelate.c | 4 ++--
>  libavfilter/vf_drawbox.c     | 2 +-
>  libavformat/dashdec.c        | 2 +-
>  libavformat/hlsenc.c         | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/libavfilter/af_axcorrelate.c b/libavfilter/af_axcorrelate.c
> index 861903b0f1..6e9a028716 100644
> --- a/libavfilter/af_axcorrelate.c
> +++ b/libavfilter/af_axcorrelate.c
> @@ -238,11 +238,11 @@ static int activate(AVFilterContext *ctx)
> 
>          ret = av_audio_fifo_peek(s->fifo[0], (void **)s->cache[0]-
> >extended_data, available);
>          if (ret < 0)
> -            return ret;;
> +            return ret;
> 
>          ret = av_audio_fifo_peek(s->fifo[1], (void **)s->cache[1]-
> >extended_data, available);
>          if (ret < 0)
> -            return ret;;
> +            return ret;
> 
>          out = ff_get_audio_buffer(ctx->outputs[0], out_samples);
>          if (!out)
> diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c
> index d71e3af397..2750048bcd 100644
> --- a/libavfilter/vf_drawbox.c
> +++ b/libavfilter/vf_drawbox.c
> @@ -292,7 +292,7 @@ static int process_command(AVFilterContext *ctx,
> const char *cmd, const char *ar
>      ret = init(ctx);
>      if (ret < 0)
>          goto end;
> -    ret = config_input(inlink);;
> +    ret = config_input(inlink);
>  end:
>      if (ret < 0) {
>          s->x = old_x;
> diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
> index d001c5b76d..72ba9605f0 100644
> --- a/libavformat/dashdec.c
> +++ b/libavformat/dashdec.c
> @@ -1934,7 +1934,7 @@ static int
> reopen_demux_for_component(AVFormatContext *s, struct
> representation
>          goto fail;
> 
>      pls->ctx->flags = AVFMT_FLAG_CUSTOM_IO;
> -    pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4;;
> +    pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4;
>      pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s-
> >max_analyze_duration : 4 * AV_TIME_BASE;
>      ret = av_probe_input_buffer(&pls->pb, &in_fmt, "", NULL, 0, 0);
>      if (ret < 0) {
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index 043438368e..fc53c9d654 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -475,7 +475,7 @@ static int flush_dynbuf(VariantStream *vs, int
> *range_length)
>  static void reflush_dynbuf(VariantStream *vs, int *range_length)
>  {
>      // re-open buffer
> -    avio_write(vs->out, vs->temp_buffer, *range_length);;
> +    avio_write(vs->out, vs->temp_buffer, *range_length);
>  }
> 
>  #if HAVE_DOS_PATHS
> --

Redundant ";" also exits in L157 of libavcodec/mpegvideo_parser.c:
https://github.com/FFmpeg/FFmpeg/blob/master/libavcodec/mpegvideo_parser.c#L157

IMHO this could be combined and fixed in one patch.

- linjie