[FFmpeg-devel] [PATCH 1/8] options: handle options with the same name in codecs and formats.

[Stefano Sabatini]

On date Wednesday 2011-07-27 18:45:11 +0200, Clément Bœsch encoded:
> From: Clément Bœsch <clement.boesch at smartjog.com>
> 
> ---
>  cmdutils.c |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/cmdutils.c b/cmdutils.c
> index b323e91..247078c 100644
> --- a/cmdutils.c
> +++ b/cmdutils.c
> @@ -284,17 +284,17 @@ unknown_opt:
>      }
>  }
>  
> -#define FLAGS (o->type == FF_OPT_TYPE_FLAGS) ? AV_DICT_APPEND : 0
> +#define FLAGS(o) ((o)->type == FF_OPT_TYPE_FLAGS) ? AV_DICT_APPEND : 0
>  int opt_default(const char *opt, const char *arg)
>  {
> -    const AVOption *o;
> -    if ((o = av_opt_find(avcodec_opts[0], opt, NULL, 0, AV_OPT_SEARCH_CHILDREN)) ||
> +    const AVOption *oc, *of, *os;
> +    if ((oc = av_opt_find(avcodec_opts[0], opt, NULL, 0, AV_OPT_SEARCH_CHILDREN)) ||
>           ((opt[0] == 'v' || opt[0] == 'a' || opt[0] == 's') &&
> -          (o = av_opt_find(avcodec_opts[0], opt+1, NULL, 0, 0))))
> -        av_dict_set(&codec_opts, opt, arg, FLAGS);
> -    else if ((o = av_opt_find(avformat_opts, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN)))
> -        av_dict_set(&format_opts, opt, arg, FLAGS);
> -    else if ((o = av_opt_find(sws_opts, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN))) {
> +          (oc = av_opt_find(avcodec_opts[0], opt+1, NULL, 0, 0))))
> +        av_dict_set(&codec_opts, opt, arg, FLAGS(oc));
> +    if ((of = av_opt_find(avformat_opts, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN)))
> +        av_dict_set(&format_opts, opt, arg, FLAGS(of));
> +    if ((os = av_opt_find(sws_opts, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN))) {
>          // XXX we only support sws_flags, not arbitrary sws options
>          int ret = av_set_string3(sws_opts, opt, arg, 1, NULL);
>          if (ret < 0) {
> @@ -303,7 +303,7 @@ int opt_default(const char *opt, const char *arg)
>          }
>      }
>  
> -    if (o)
> +    if (oc || of || os)
>          return 0;
>      fprintf(stderr, "Unrecognized option '%s'\n", opt);
>      return AVERROR_OPTION_NOT_FOUND;

Looks fine to me, but the commit message could be more explicative.

What's exactly the problem which are you fixing?
-- 
FFmpeg = Fast and Fascinating Mind-dumbing Purposeless Exxagerate Goblin