Merge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece'

* commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece':
  vf_format: rework format list parsing

Conflicts:
	libavfilter/vf_format.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavfilter/vf_format.c
index 8a41153,d37f870..cc71b29
--- 1/libavfilter/vf_format.c
--- 2/libavfilter/vf_format.c
+++ b/libavfilter/vf_format.c
@@@ -50,32 -55,69 +55,70 @@@ static av_cold void uninit(AVFilterCont
  static av_cold int init(AVFilterContext *ctx)
  {
      FormatContext *s = ctx->priv;
-     const char *cur, *sep;
-     char             pix_fmt_name[AV_PIX_FMT_NAME_MAXSIZE];
-     int              pix_fmt_name_len, ret;
-     enum AVPixelFormat pix_fmt;
+     char *cur, *sep;
+     int nb_formats = 1;
+     int i;
++    int ret;
+ 
+     /* count the formats */
+     cur = s->pix_fmts;
+     while ((cur = strchr(cur, '|'))) {
+         nb_formats++;
+         if (*cur)
+             cur++;
+     }
+ 
+     s->formats = av_malloc_array(nb_formats + 1, sizeof(*s->formats));
+     if (!s->formats)
+         return AVERROR(ENOMEM);
  
 +    if (!s->pix_fmts)
 +        return AVERROR(EINVAL);
 +
      /* parse the list of formats */
-     for (cur = s->pix_fmts; cur; cur = sep ? sep + 1 : NULL) {
-         if (!(sep = strchr(cur, '|')))
-             pix_fmt_name_len = strlen(cur);
-         else
-             pix_fmt_name_len = sep - cur;
-         if (pix_fmt_name_len >= AV_PIX_FMT_NAME_MAXSIZE) {
-             av_log(ctx, AV_LOG_ERROR, "Format name too long\n");
-             return -1;
-         }
- 
-         memcpy(pix_fmt_name, cur, pix_fmt_name_len);
-         pix_fmt_name[pix_fmt_name_len] = 0;
+     cur = s->pix_fmts;
+     for (i = 0; i < nb_formats; i++) {
+         sep = strchr(cur, '|');
+         if (sep)
+             *sep++ = 0;
  
-         if ((ret = ff_parse_pixel_format(&pix_fmt, pix_fmt_name, ctx)) < 0)
 -        s->formats[i] = av_get_pix_fmt(cur);
 -        if (s->formats[i] == AV_PIX_FMT_NONE) {
 -            av_log(ctx, AV_LOG_ERROR, "Unknown pixel format: %s\n", cur);
 -            return AVERROR(EINVAL);
 -        }
++        if ((ret = ff_parse_pixel_format(&s->formats[i], cur, ctx)) < 0)
 +            return ret;
  
-         s->listed_pix_fmt_flags[pix_fmt] = 1;
+         cur = sep;
+     }
+     s->formats[nb_formats] = AV_PIX_FMT_NONE;
+ 
+     if (!strcmp(ctx->filter->name, "noformat")) {
+         const AVPixFmtDescriptor *desc = NULL;
+         enum AVPixelFormat *formats_allowed;
+         int nb_formats_lavu = 0, nb_formats_allowed = 0;;
+ 
+         /* count the formats known to lavu */
+         while ((desc = av_pix_fmt_desc_next(desc)))
+             nb_formats_lavu++;
+ 
+         formats_allowed = av_malloc_array(nb_formats_lavu + 1, sizeof(*formats_allowed));
+         if (!formats_allowed)
+             return AVERROR(ENOMEM);
+ 
+         /* for each format known to lavu, check if it's in the list of
+          * forbidden formats */
+         while ((desc = av_pix_fmt_desc_next(desc))) {
+             enum AVPixelFormat pix_fmt = av_pix_fmt_desc_get_id(desc);
+ 
+             for (i = 0; i < nb_formats; i++) {
+                 if (s->formats[i] == pix_fmt)
+                     break;
+             }
+             if (i < nb_formats)
+                 continue;
+ 
+             formats_allowed[nb_formats_allowed++] = pix_fmt;
+         }
+         formats_allowed[nb_formats_allowed] = AV_PIX_FMT_NONE;
+         av_freep(&s->formats);
+         s->formats = formats_allowed;
      }
  
      return 0;
@@@ -105,14 -143,12 +144,9 @@@ static const AVOption options[] = 
  };
  
  #if CONFIG_FORMAT_FILTER
- static int query_formats_format(AVFilterContext *ctx)
- {
-     ff_set_common_formats(ctx, make_format_list(ctx->priv, 1));
-     return 0;
- }
 -static const AVClass format_class = {
 -    .class_name = "format",
 -    .item_name  = av_default_item_name,
 -    .option     = options,
 -    .version    = LIBAVUTIL_VERSION_INT,
 -};
 +
 +#define format_options options
 +AVFILTER_DEFINE_CLASS(format);
  
  static const AVFilterPad avfilter_vf_format_inputs[] = {
      {
@@@ -132,26 -168,29 +166,26 @@@ static const AVFilterPad avfilter_vf_fo
  };
  
  AVFilter ff_vf_format = {
 -    .name      = "format",
 -    .description = NULL_IF_CONFIG_SMALL("Convert the input video to one of the specified pixel formats."),
 +    .name          = "format",
 +    .description   = NULL_IF_CONFIG_SMALL("Convert the input video to one of the specified pixel formats."),
+ 
 -    .init      = init,
 -    .uninit    = uninit,
 +    .init          = init,
-     .query_formats = query_formats_format,
++    .uninit        = uninit,
+ 
+     .query_formats = query_formats,
+ 
 -    .priv_size = sizeof(FormatContext),
 -    .priv_class = &format_class,
 +    .priv_size     = sizeof(FormatContext),
 +    .priv_class    = &format_class,
+ 
 -    .inputs    = avfilter_vf_format_inputs,
 -    .outputs   = avfilter_vf_format_outputs,
 +    .inputs        = avfilter_vf_format_inputs,
 +    .outputs       = avfilter_vf_format_outputs,
  };
  #endif /* CONFIG_FORMAT_FILTER */
  
  #if CONFIG_NOFORMAT_FILTER
- static int query_formats_noformat(AVFilterContext *ctx)
- {
-     ff_set_common_formats(ctx, make_format_list(ctx->priv, 0));
-     return 0;
- }
 -static const AVClass noformat_class = {
 -    .class_name = "noformat",
 -    .item_name  = av_default_item_name,
 -    .option     = options,
 -    .version    = LIBAVUTIL_VERSION_INT,
 -};
 +
 +#define noformat_options options
 +AVFILTER_DEFINE_CLASS(noformat);
  
  static const AVFilterPad avfilter_vf_noformat_inputs[] = {
      {
@@@ -171,13 -210,18 +205,18 @@@ static const AVFilterPad avfilter_vf_no
  };
  
  AVFilter ff_vf_noformat = {
 -    .name      = "noformat",
 -    .description = NULL_IF_CONFIG_SMALL("Force libavfilter not to use any of the specified pixel formats for the input to the next filter."),
 +    .name          = "noformat",
 +    .description   = NULL_IF_CONFIG_SMALL("Force libavfilter not to use any of the specified pixel formats for the input to the next filter."),
+ 
 -    .init      = init,
 -    .uninit    = uninit,
 +    .init          = init,
-     .query_formats = query_formats_noformat,
++    .uninit        = uninit,
+ 
+     .query_formats = query_formats,
+ 
 -    .priv_size = sizeof(FormatContext),
 -    .priv_class = &noformat_class,
 +    .priv_size     = sizeof(FormatContext),
 +    .priv_class    = &noformat_class,
+ 
 -    .inputs    = avfilter_vf_noformat_inputs,
 -    .outputs   = avfilter_vf_noformat_outputs,
 +    .inputs        = avfilter_vf_noformat_inputs,
 +    .outputs       = avfilter_vf_noformat_outputs,
  };
  #endif /* CONFIG_NOFORMAT_FILTER */