Browse Source

avfilter: handle error in query_formats() in bunch of filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
tags/n2.7
Paul B Mahol 10 years ago
parent
commit
a0854c084e
81 changed files with 401 additions and 234 deletions
  1. +20
    -4
      libavfilter/aeval.c
  2. +8
    -5
      libavfilter/af_adelay.c
  3. +8
    -5
      libavfilter/af_aecho.c
  4. +8
    -5
      libavfilter/af_afade.c
  5. +8
    -5
      libavfilter/af_aformat.c
  6. +8
    -4
      libavfilter/af_amix.c
  7. +8
    -5
      libavfilter/af_aphaser.c
  8. +1
    -2
      libavfilter/af_asetrate.c
  9. +8
    -5
      libavfilter/af_astats.c
  10. +8
    -5
      libavfilter/af_atempo.c
  11. +8
    -5
      libavfilter/af_biquads.c
  12. +8
    -5
      libavfilter/af_bs2b.c
  13. +8
    -5
      libavfilter/af_compand.c
  14. +8
    -5
      libavfilter/af_dcshift.c
  15. +8
    -5
      libavfilter/af_flanger.c
  16. +8
    -5
      libavfilter/af_silencedetect.c
  17. +8
    -5
      libavfilter/af_silenceremove.c
  18. +8
    -5
      libavfilter/af_volume.c
  19. +1
    -3
      libavfilter/af_volumedetect.c
  20. +21
    -4
      libavfilter/asrc_sine.c
  21. +4
    -2
      libavfilter/vf_bbox.c
  22. +4
    -2
      libavfilter/vf_blackdetect.c
  23. +4
    -2
      libavfilter/vf_blackframe.c
  24. +4
    -2
      libavfilter/vf_blend.c
  25. +1
    -2
      libavfilter/vf_boxblur.c
  26. +4
    -2
      libavfilter/vf_colorchannelmixer.c
  27. +4
    -2
      libavfilter/vf_colorlevels.c
  28. +1
    -2
      libavfilter/vf_crop.c
  29. +4
    -2
      libavfilter/vf_cropdetect.c
  30. +1
    -2
      libavfilter/vf_detelecine.c
  31. +1
    -2
      libavfilter/vf_drawtext.c
  32. +6
    -3
      libavfilter/vf_fade.c
  33. +4
    -3
      libavfilter/vf_fftfilt.c
  34. +1
    -2
      libavfilter/vf_format.c
  35. +4
    -2
      libavfilter/vf_framepack.c
  36. +1
    -2
      libavfilter/vf_frei0r.c
  37. +5
    -2
      libavfilter/vf_fspp.c
  38. +7
    -3
      libavfilter/vf_geq.c
  39. +1
    -2
      libavfilter/vf_hflip.c
  40. +5
    -3
      libavfilter/vf_histogram.c
  41. +1
    -2
      libavfilter/vf_il.c
  42. +4
    -2
      libavfilter/vf_interlace.c
  43. +4
    -3
      libavfilter/vf_kerndeint.c
  44. +1
    -2
      libavfilter/vf_noise.c
  45. +1
    -2
      libavfilter/vf_pad.c
  46. +4
    -2
      libavfilter/vf_perspective.c
  47. +4
    -2
      libavfilter/vf_phase.c
  48. +5
    -2
      libavfilter/vf_pp.c
  49. +5
    -2
      libavfilter/vf_pp7.c
  50. +4
    -2
      libavfilter/vf_psnr.c
  51. +5
    -2
      libavfilter/vf_pullup.c
  52. +4
    -2
      libavfilter/vf_removelogo.c
  53. +4
    -3
      libavfilter/vf_repeatfields.c
  54. +4
    -2
      libavfilter/vf_rotate.c
  55. +4
    -3
      libavfilter/vf_sab.c
  56. +4
    -2
      libavfilter/vf_signalstats.c
  57. +4
    -3
      libavfilter/vf_smartblur.c
  58. +5
    -2
      libavfilter/vf_spp.c
  59. +5
    -3
      libavfilter/vf_stereo3d.c
  60. +1
    -2
      libavfilter/vf_subtitles.c
  61. +4
    -2
      libavfilter/vf_super2xsai.c
  62. +1
    -2
      libavfilter/vf_swapuv.c
  63. +1
    -2
      libavfilter/vf_telecine.c
  64. +4
    -2
      libavfilter/vf_thumbnail.c
  65. +1
    -2
      libavfilter/vf_tile.c
  66. +4
    -2
      libavfilter/vf_tinterlace.c
  67. +1
    -2
      libavfilter/vf_transpose.c
  68. +4
    -3
      libavfilter/vf_unsharp.c
  69. +5
    -2
      libavfilter/vf_uspp.c
  70. +4
    -2
      libavfilter/vf_vidstabdetect.c
  71. +4
    -2
      libavfilter/vf_vidstabtransform.c
  72. +4
    -2
      libavfilter/vf_vignette.c
  73. +4
    -3
      libavfilter/vf_w3fdif.c
  74. +4
    -2
      libavfilter/vf_xbr.c
  75. +4
    -3
      libavfilter/vf_yadif.c
  76. +4
    -3
      libavfilter/vf_zoompan.c
  77. +4
    -2
      libavfilter/vsrc_cellauto.c
  78. +5
    -1
      libavfilter/vsrc_life.c
  79. +4
    -2
      libavfilter/vsrc_mandelbrot.c
  80. +4
    -2
      libavfilter/vsrc_mptestsrc.c
  81. +21
    -10
      libavfilter/vsrc_testsrc.c

+ 20
- 4
libavfilter/aeval.c View File

@@ -247,12 +247,28 @@ static int query_formats(AVFilterContext *ctx)
static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE };
int64_t chlayouts[] = { eval->chlayout ? eval->chlayout : FF_COUNT2LAYOUT(eval->nb_channels) , -1 };
int sample_rates[] = { eval->sample_rate, -1 };
AVFilterFormats *formats;
AVFilterChannelLayouts *layouts;
int ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ret = ff_set_common_formats (ctx, formats);
if (ret < 0)
return ret;

ff_set_common_formats (ctx, ff_make_format_list(sample_fmts));
ff_set_common_channel_layouts(ctx, avfilter_make_format64_list(chlayouts));
ff_set_common_samplerates(ctx, ff_make_format_list(sample_rates));
layouts = avfilter_make_format64_list(chlayouts);
if (!layouts)
return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

return 0;
formats = ff_make_format_list(sample_rates);
if (!formats)
return AVERROR(ENOMEM);
return ff_set_common_samplerates(ctx, formats);
}

static int request_frame(AVFilterLink *outlink)


+ 8
- 5
libavfilter/af_adelay.c View File

@@ -64,23 +64,26 @@ static int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP,
AV_SAMPLE_FMT_NONE
};
int ret;

layouts = ff_all_channel_layouts();
if (!layouts)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

#define DELAY(name, type, fill) \


+ 8
- 5
libavfilter/af_aecho.c View File

@@ -158,23 +158,26 @@ static int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP,
AV_SAMPLE_FMT_NONE
};
int ret;

layouts = ff_all_channel_layouts();
if (!layouts)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

#define MOD(a, b) (((a) >= (b)) ? (a) - (b) : (a))


+ 8
- 5
libavfilter/af_afade.c View File

@@ -98,23 +98,26 @@ static int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP,
AV_SAMPLE_FMT_NONE
};
int ret;

layouts = ff_all_channel_layouts();
if (!layouts)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

static double fade_gain(int curve, int64_t index, int range)


+ 8
- 5
libavfilter/af_aformat.c View File

@@ -108,15 +108,18 @@ static av_cold int init(AVFilterContext *ctx)
static int query_formats(AVFilterContext *ctx)
{
AFormatContext *s = ctx->priv;
int ret;

ff_set_common_formats(ctx, s->formats ? s->formats :
ret = ff_set_common_formats(ctx, s->formats ? s->formats :
ff_all_formats(AVMEDIA_TYPE_AUDIO));
ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates :
if (ret < 0)
return ret;
ret = ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates :
ff_all_samplerates());
ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts :
if (ret < 0)
return ret;
return ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts :
ff_all_channel_counts());

return 0;
}

static const AVFilterPad avfilter_af_aformat_inputs[] = {


+ 8
- 4
libavfilter/af_amix.c View File

@@ -534,6 +534,7 @@ static int query_formats(AVFilterContext *ctx)
{
AVFilterFormats *formats = NULL;
AVFilterChannelLayouts *layouts;
int ret;

layouts = ff_all_channel_layouts();

@@ -542,10 +543,13 @@ static int query_formats(AVFilterContext *ctx)

ff_add_format(&formats, AV_SAMPLE_FMT_FLT);
ff_add_format(&formats, AV_SAMPLE_FMT_FLTP);
ff_set_common_formats(ctx, formats);
ff_set_common_channel_layouts(ctx, layouts);
ff_set_common_samplerates(ctx, ff_all_samplerates());
return 0;
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;
return ff_set_common_samplerates(ctx, ff_all_samplerates());
}

static const AVFilterPad avfilter_af_amix_outputs[] = {


+ 8
- 5
libavfilter/af_aphaser.c View File

@@ -94,23 +94,26 @@ static int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_NONE
};
int ret;

layouts = ff_all_channel_layouts();
if (!layouts)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

#define MOD(a, b) (((a) >= (b)) ? (a) - (b) : (a))


+ 1
- 2
libavfilter/af_asetrate.c View File

@@ -51,9 +51,8 @@ static av_cold int query_formats(AVFilterContext *ctx)
ASetRateContext *sr = ctx->priv;
int sample_rates[] = { sr->sample_rate, -1 };

ff_formats_ref(ff_make_format_list(sample_rates),
return ff_formats_ref(ff_make_format_list(sample_rates),
&ctx->outputs[0]->in_samplerates);
return 0;
}

static av_cold int config_props(AVFilterLink *outlink)


+ 8
- 5
libavfilter/af_astats.c View File

@@ -64,23 +64,26 @@ static int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP,
AV_SAMPLE_FMT_NONE
};
int ret;

layouts = ff_all_channel_layouts();
if (!layouts)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

static int config_output(AVFilterLink *outlink)


+ 8
- 5
libavfilter/af_atempo.c View File

@@ -1012,26 +1012,29 @@ static int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_DBL,
AV_SAMPLE_FMT_NONE
};
int ret;

layouts = ff_all_channel_layouts();
if (!layouts) {
return AVERROR(ENOMEM);
}
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats) {
return AVERROR(ENOMEM);
}
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats) {
return AVERROR(ENOMEM);
}
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

static int config_props(AVFilterLink *inlink)


+ 8
- 5
libavfilter/af_biquads.c View File

@@ -142,23 +142,26 @@ static int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_DBLP,
AV_SAMPLE_FMT_NONE
};
int ret;

layouts = ff_all_channel_layouts();
if (!layouts)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

#define BIQUAD_FILTER(name, type, min, max, need_clipping) \


+ 8
- 5
libavfilter/af_bs2b.c View File

@@ -106,22 +106,25 @@ static int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_DBL,
AV_SAMPLE_FMT_NONE,
};
int ret;

if (ff_add_channel_layout(&layouts, AV_CH_LAYOUT_STEREO) != 0)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

static int filter_frame(AVFilterLink *inlink, AVFrame *frame)


+ 8
- 5
libavfilter/af_compand.c View File

@@ -107,23 +107,26 @@ static int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_DBLP,
AV_SAMPLE_FMT_NONE
};
int ret;

layouts = ff_all_channel_layouts();
if (!layouts)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

static void count_items(char *item_str, int *nb_items)


+ 8
- 5
libavfilter/af_dcshift.c View File

@@ -59,23 +59,26 @@ static int query_formats(AVFilterContext *ctx)
static const enum AVSampleFormat sample_fmts[] = {
AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE
};
int ret;

layouts = ff_all_channel_layouts();
if (!layouts)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

static int filter_frame(AVFilterLink *inlink, AVFrame *in)


+ 8
- 5
libavfilter/af_flanger.c View File

@@ -95,23 +95,26 @@ static int query_formats(AVFilterContext *ctx)
static const enum AVSampleFormat sample_fmts[] = {
AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE
};
int ret;

layouts = ff_all_channel_layouts();
if (!layouts)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

static int config_input(AVFilterLink *inlink)


+ 8
- 5
libavfilter/af_silencedetect.c View File

@@ -164,23 +164,26 @@ static int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE
};
int ret;

layouts = ff_all_channel_layouts();
if (!layouts)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

static const AVFilterPad silencedetect_inputs[] = {


+ 8
- 5
libavfilter/af_silenceremove.c View File

@@ -418,23 +418,26 @@ static int query_formats(AVFilterContext *ctx)
static const enum AVSampleFormat sample_fmts[] = {
AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_NONE
};
int ret;

layouts = ff_all_channel_layouts();
if (!layouts)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

static av_cold void uninit(AVFilterContext *ctx)


+ 8
- 5
libavfilter/af_volume.c View File

@@ -153,23 +153,26 @@ static int query_formats(AVFilterContext *ctx)
AV_SAMPLE_FMT_NONE
}
};
int ret;

layouts = ff_all_channel_counts();
if (!layouts)
return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_fmts[vol->precision]);
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);
ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;

formats = ff_all_samplerates();
if (!formats)
return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats);

return 0;
return ff_set_common_samplerates(ctx, formats);
}

static inline void scale_samples_u8(uint8_t *dst, const uint8_t *src,


+ 1
- 3
libavfilter/af_volumedetect.c View File

@@ -44,9 +44,7 @@ static int query_formats(AVFilterContext *ctx)

if (!(formats = ff_make_format_list(sample_fmts)))
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats);

return 0;
return ff_set_common_formats(ctx, formats);
}

static int filter_frame(AVFilterLink *inlink, AVFrame *samples)


+ 21
- 4
libavfilter/asrc_sine.c View File

@@ -153,11 +153,28 @@ static av_cold int query_formats(AVFilterContext *ctx)
int sample_rates[] = { sine->sample_rate, -1 };
static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE };
AVFilterFormats *formats;
AVFilterChannelLayouts *layouts;
int ret;

ff_set_common_formats (ctx, ff_make_format_list(sample_fmts));
ff_set_common_channel_layouts(ctx, avfilter_make_format64_list(chlayouts));
ff_set_common_samplerates(ctx, ff_make_format_list(sample_rates));
return 0;
formats = ff_make_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
ret = ff_set_common_formats (ctx, formats);
if (ret < 0)
return ret;

layouts = avfilter_make_format64_list(chlayouts);
if (!layouts)
return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;

formats = ff_make_format_list(sample_rates);
if (!formats)
return AVERROR(ENOMEM);
return ff_set_common_samplerates(ctx, formats);
}

static av_cold int config_props(AVFilterLink *outlink)


+ 4
- 2
libavfilter/vf_bbox.c View File

@@ -56,8 +56,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE,
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

#define SET_META(key, value) \


+ 4
- 2
libavfilter/vf_blackdetect.c View File

@@ -80,8 +80,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_blackframe.c View File

@@ -54,8 +54,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

#define SET_META(key, format, value) \


+ 4
- 2
libavfilter/vf_blend.c View File

@@ -369,8 +369,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static av_cold void uninit(AVFilterContext *ctx)


+ 1
- 2
libavfilter/vf_boxblur.c View File

@@ -128,8 +128,7 @@ static int query_formats(AVFilterContext *ctx)
ff_add_format(&formats, fmt);
}

ff_set_common_formats(ctx, formats);
return 0;
return ff_set_common_formats(ctx, formats);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_colorchannelmixer.c View File

@@ -81,8 +81,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_output(AVFilterLink *outlink)


+ 4
- 2
libavfilter/vf_colorlevels.c View File

@@ -84,8 +84,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 1
- 2
libavfilter/vf_crop.c View File

@@ -102,8 +102,7 @@ static int query_formats(AVFilterContext *ctx)
ff_add_format(&formats, fmt);
}

ff_set_common_formats(ctx, formats);
return 0;
return ff_set_common_formats(ctx, formats);
}

static av_cold void uninit(AVFilterContext *ctx)


+ 4
- 2
libavfilter/vf_cropdetect.c View File

@@ -62,8 +62,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int checkline(void *ctx, const unsigned char *src, int stride, int len, int bpp)


+ 1
- 2
libavfilter/vf_detelecine.c View File

@@ -126,8 +126,7 @@ static int query_formats(AVFilterContext *ctx)
ff_add_format(&pix_fmts, fmt);
}

ff_set_common_formats(ctx, pix_fmts);
return 0;
return ff_set_common_formats(ctx, pix_fmts);
}

static int config_input(AVFilterLink *inlink)


+ 1
- 2
libavfilter/vf_drawtext.c View File

@@ -682,8 +682,7 @@ static av_cold int init(AVFilterContext *ctx)

static int query_formats(AVFilterContext *ctx)
{
ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
return 0;
return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
}

static int glyph_enu_free(void *opaque, void *elem)


+ 6
- 3
libavfilter/vf_fade.c View File

@@ -115,12 +115,15 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA,
AV_PIX_FMT_NONE
};
AVFilterFormats *fmts_list;

if (s->black_fade)
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
fmts_list = ff_make_format_list(pix_fmts);
else
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts_rgb));
return 0;
fmts_list = ff_make_format_list(pix_fmts_rgb);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

const static enum AVPixelFormat studio_level_pix_fmts[] = {


+ 4
- 3
libavfilter/vf_fftfilt.c View File

@@ -307,9 +307,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pixel_fmts_fftfilt));

return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pixel_fmts_fftfilt);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static const AVFilterPad fftfilt_inputs[] = {


+ 1
- 2
libavfilter/vf_format.c View File

@@ -134,8 +134,7 @@ static int query_formats(AVFilterContext *ctx)
if (!formats)
return AVERROR(ENOMEM);

ff_set_common_formats(ctx, formats);
return 0;
return ff_set_common_formats(ctx, formats);
}




+ 4
- 2
libavfilter/vf_framepack.c View File

@@ -61,8 +61,10 @@ static const enum AVPixelFormat formats_supported[] = {
static int query_formats(AVFilterContext *ctx)
{
// this will ensure that formats are the same on all pads
ff_set_common_formats(ctx, ff_make_format_list(formats_supported));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(formats_supported);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static av_cold void framepack_uninit(AVFilterContext *ctx)


+ 1
- 2
libavfilter/vf_frei0r.c View File

@@ -385,8 +385,7 @@ static int query_formats(AVFilterContext *ctx)
if (!formats)
return AVERROR(ENOMEM);

ff_set_common_formats(ctx, formats);
return 0;
return ff_set_common_formats(ctx, formats);
}

static int filter_frame(AVFilterLink *inlink, AVFrame *in)


+ 5
- 2
libavfilter/vf_fspp.c View File

@@ -501,8 +501,11 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;

AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 7
- 3
libavfilter/vf_geq.c View File

@@ -176,11 +176,15 @@ static int geq_query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
AV_PIX_FMT_NONE
};
AVFilterFormats *fmts_list;

if (geq->is_rgb) {
ff_set_common_formats(ctx, ff_make_format_list(rgb_pix_fmts));
fmts_list = ff_make_format_list(rgb_pix_fmts);
} else
ff_set_common_formats(ctx, ff_make_format_list(yuv_pix_fmts));
return 0;
fmts_list = ff_make_format_list(yuv_pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int geq_config_props(AVFilterLink *inlink)


+ 1
- 2
libavfilter/vf_hflip.c View File

@@ -55,8 +55,7 @@ static int query_formats(AVFilterContext *ctx)
ff_add_format(&pix_fmts, fmt);
}

ff_set_common_formats(ctx, pix_fmts);
return 0;
return ff_set_common_formats(ctx, pix_fmts);
}

static int config_props(AVFilterLink *inlink)


+ 5
- 3
libavfilter/vf_histogram.c View File

@@ -105,6 +105,7 @@ static int query_formats(AVFilterContext *ctx)
{
HistogramContext *h = ctx->priv;
const enum AVPixelFormat *pix_fmts;
AVFilterFormats *fmts_list;

switch (h->mode) {
case MODE_WAVEFORM:
@@ -121,9 +122,10 @@ static int query_formats(AVFilterContext *ctx)
av_assert0(0);
}

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));

return 0;
fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static const uint8_t black_yuva_color[4] = { 0, 127, 127, 255 };


+ 1
- 2
libavfilter/vf_il.c View File

@@ -92,8 +92,7 @@ static int query_formats(AVFilterContext *ctx)
ff_add_format(&formats, fmt);
}

ff_set_common_formats(ctx, formats);
return 0;
return ff_set_common_formats(ctx, formats);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_interlace.c View File

@@ -76,8 +76,10 @@ static const enum AVPixelFormat formats_supported[] = {

static int query_formats(AVFilterContext *ctx)
{
ff_set_common_formats(ctx, ff_make_format_list(formats_supported));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(formats_supported);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static av_cold void uninit(AVFilterContext *ctx)


+ 4
- 3
libavfilter/vf_kerndeint.c View File

@@ -78,9 +78,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));

return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_props(AVFilterLink *inlink)


+ 1
- 2
libavfilter/vf_noise.c View File

@@ -141,8 +141,7 @@ static int query_formats(AVFilterContext *ctx)
ff_add_format(&formats, fmt);
}

ff_set_common_formats(ctx, formats);
return 0;
return ff_set_common_formats(ctx, formats);
}

static int config_input(AVFilterLink *inlink)


+ 1
- 2
libavfilter/vf_pad.c View File

@@ -73,8 +73,7 @@ enum var_name {

static int query_formats(AVFilterContext *ctx)
{
ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
return 0;
return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
}

typedef struct PadContext {


+ 4
- 2
libavfilter/vf_perspective.c View File

@@ -93,8 +93,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static inline double get_coeff(double d)


+ 4
- 2
libavfilter/vf_phase.c View File

@@ -77,8 +77,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 5
- 2
libavfilter/vf_pp.c View File

@@ -85,8 +85,11 @@ static int pp_query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GRAY8,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;

AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int pp_config_props(AVFilterLink *inlink)


+ 5
- 2
libavfilter/vf_pp7.c View File

@@ -274,8 +274,11 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GBRP,
AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;

AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_psnr.c View File

@@ -232,8 +232,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input_ref(AVFilterLink *inlink)


+ 5
- 2
libavfilter/vf_pullup.c View File

@@ -63,8 +63,11 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_GRAY8,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;

AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

#define ABS(a) (((a) ^ ((a) >> 31)) - ((a) >> 31))


+ 4
- 2
libavfilter/vf_removelogo.c View File

@@ -206,8 +206,10 @@ static void convert_mask_to_strength_mask(uint8_t *data, int linesize,
static int query_formats(AVFilterContext *ctx)
{
static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE };
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int load_mask(uint8_t **mask, int *w, int *h,


+ 4
- 3
libavfilter/vf_repeatfields.c View File

@@ -50,9 +50,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pixel_fmts_eq));

return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pixel_fmts_eq);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_rotate.c View File

@@ -145,8 +145,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static double get_rotated_w(void *opaque, double angle)


+ 4
- 3
libavfilter/vf_sab.c View File

@@ -65,9 +65,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUV411P,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));

return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

#define RADIUS_MIN 0.1


+ 4
- 2
libavfilter/vf_signalstats.c View File

@@ -118,8 +118,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static AVFrame *alloc_frame(enum AVPixelFormat pixfmt, int w, int h)


+ 4
- 3
libavfilter/vf_smartblur.c View File

@@ -124,9 +124,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));

return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int alloc_sws_context(FilterParam *f, int width, int height, unsigned int flags)


+ 5
- 2
libavfilter/vf_spp.c View File

@@ -319,8 +319,11 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GBRP10,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;

AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 5
- 3
libavfilter/vf_stereo3d.c View File

@@ -256,6 +256,7 @@ static int query_formats(AVFilterContext *ctx)
{
Stereo3DContext *s = ctx->priv;
const enum AVPixelFormat *pix_fmts;
AVFilterFormats *fmts_list;

switch (s->out.format) {
case ANAGLYPH_GM_COLOR:
@@ -278,9 +279,10 @@ static int query_formats(AVFilterContext *ctx)
pix_fmts = other_pix_fmts;
}

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));

return 0;
fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_output(AVFilterLink *outlink)


+ 1
- 2
libavfilter/vf_subtitles.c View File

@@ -129,8 +129,7 @@ static av_cold void uninit(AVFilterContext *ctx)

static int query_formats(AVFilterContext *ctx)
{
ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
return 0;
return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_super2xsai.c View File

@@ -241,8 +241,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 1
- 2
libavfilter/vf_swapuv.c View File

@@ -79,8 +79,7 @@ static int query_formats(AVFilterContext *ctx)
ff_add_format(&formats, fmt);
}

ff_set_common_formats(ctx, formats);
return 0;
return ff_set_common_formats(ctx, formats);
}

static const AVFilterPad swapuv_inputs[] = {


+ 1
- 2
libavfilter/vf_telecine.c View File

@@ -112,8 +112,7 @@ static int query_formats(AVFilterContext *ctx)
ff_add_format(&pix_fmts, fmt);
}

ff_set_common_formats(ctx, pix_fmts);
return 0;
return ff_set_common_formats(ctx, pix_fmts);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_thumbnail.c View File

@@ -203,8 +203,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static const AVFilterPad thumbnail_inputs[] = {


+ 1
- 2
libavfilter/vf_tile.c View File

@@ -87,8 +87,7 @@ static av_cold int init(AVFilterContext *ctx)

static int query_formats(AVFilterContext *ctx)
{
ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
return 0;
return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
}

static int config_props(AVFilterLink *outlink)


+ 4
- 2
libavfilter/vf_tinterlace.c View File

@@ -81,8 +81,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static void lowpass_line_c(uint8_t *dstp, ptrdiff_t width, const uint8_t *srcp,


+ 1
- 2
libavfilter/vf_transpose.c View File

@@ -75,8 +75,7 @@ static int query_formats(AVFilterContext *ctx)
}


ff_set_common_formats(ctx, pix_fmts);
return 0;
return ff_set_common_formats(ctx, pix_fmts);
}

static int config_props_output(AVFilterLink *outlink)


+ 4
- 3
libavfilter/vf_unsharp.c View File

@@ -163,9 +163,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));

return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int init_filter_param(AVFilterContext *ctx, UnsharpFilterParam *fp, const char *effect_type, int width)


+ 5
- 2
libavfilter/vf_uspp.c View File

@@ -293,8 +293,11 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GRAY8,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;

AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_vidstabdetect.c View File

@@ -93,8 +93,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_vidstabtransform.c View File

@@ -132,8 +132,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}




+ 4
- 2
libavfilter/vf_vignette.c View File

@@ -136,8 +136,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GRAY8,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static double get_natural_factor(const VignetteContext *s, int x, int y)


+ 4
- 3
libavfilter/vf_w3fdif.c View File

@@ -74,9 +74,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));

return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_xbr.c View File

@@ -342,8 +342,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_0RGB32, AV_PIX_FMT_NONE,
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int filter_frame(AVFilterLink *inlink, AVFrame *in)


+ 4
- 3
libavfilter/vf_yadif.c View File

@@ -461,9 +461,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));

return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_props(AVFilterLink *link)


+ 4
- 3
libavfilter/vf_zoompan.c View File

@@ -264,9 +264,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};


ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static av_cold void uninit(AVFilterContext *ctx)


+ 4
- 2
libavfilter/vsrc_cellauto.c View File

@@ -310,8 +310,10 @@ static int request_frame(AVFilterLink *outlink)
static int query_formats(AVFilterContext *ctx)
{
static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE };
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static const AVFilterPad cellauto_outputs[] = {


+ 5
- 1
libavfilter/vsrc_life.c View File

@@ -423,7 +423,11 @@ static int query_formats(AVFilterContext *ctx)
pix_fmts[0] = AV_PIX_FMT_MONOBLACK;
life->draw = fill_picture_monoblack;
}
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));

AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
ff_set_common_formats(ctx, fmts_list);
return 0;
}



+ 4
- 2
libavfilter/vsrc_mandelbrot.c View File

@@ -153,8 +153,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_props(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vsrc_mptestsrc.c View File

@@ -291,8 +291,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int request_frame(AVFilterLink *outlink)


+ 21
- 10
libavfilter/vsrc_testsrc.c View File

@@ -202,8 +202,7 @@ static av_cold int color_init(AVFilterContext *ctx)

static int color_query_formats(AVFilterContext *ctx)
{
ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
return 0;
return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0));
}

static int color_config_props(AVFilterLink *inlink)
@@ -366,8 +365,11 @@ static int haldclutsrc_query_formats(AVFilterContext *ctx)
AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64,
AV_PIX_FMT_NONE,
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;

AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int haldclutsrc_config_props(AVFilterLink *outlink)
@@ -646,8 +648,11 @@ static int test_query_formats(AVFilterContext *ctx)
static const enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;

AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static const AVFilterPad avfilter_vsrc_testsrc_outputs[] = {
@@ -754,8 +759,11 @@ static int rgbtest_query_formats(AVFilterContext *ctx)
AV_PIX_FMT_RGB555, AV_PIX_FMT_BGR555,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;

AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int rgbtest_config_props(AVFilterLink *outlink)
@@ -883,8 +891,11 @@ static int smptebars_query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P,
AV_PIX_FMT_NONE,
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;

AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static const AVFilterPad smptebars_outputs[] = {


Loading…
Cancel
Save