[FFmpeg-devel] [PATCH 1/4] lavfi/aformat: use do..while(0) form for macro.

Stefano Sabatini stefasab at gmail.com
Tue Jan 31 15:44:24 CET 2012


On date Tuesday 2012-01-31 08:31:45 +0100, Clément Bœsch encoded:
> This avoids some empty statements.
> ---
>  libavfilter/af_aformat.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
> index e892635..e7ef7f0 100644
> --- a/libavfilter/af_aformat.c
> +++ b/libavfilter/af_aformat.c
> @@ -42,7 +42,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
>      if (!args)
>          goto arg_fail;
>  
> -#define ADD_FORMATS(all_formats, fmt_name, fmt_type, fmts_list)         \
> +#define ADD_FORMATS(all_formats, fmt_name, fmt_type, fmts_list) do {    \
>      fmts_str = av_get_token(&args, ":");                                \
>      if (!fmts_str || !*fmts_str)                                        \
>          goto arg_fail;                                                  \
> @@ -61,7 +61,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
>      }                                                                   \
>      av_freep(&fmts_str);                                                \
>      if (*args)                                                          \
> -        args++;
> +        args++;                                                         \
> +} while (0)
>  
>      ADD_FORMATS(avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO), sample_format, int, formats);
>      ADD_FORMATS(avfilter_make_all_channel_layouts(), channel_layout, int64_t, chlayouts);

Looks safe.
-- 
FFmpeg = Friendly and Faithful Mind-dumbing Portable Ecstatic Gigant


More information about the ffmpeg-devel mailing list