X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_extractplanes.c;h=b10cd13f8ff5c7a43680cff1362f6ce6c7aa9a1a;hb=16766bf8a8e477da09337801b96f732740a0b279;hp=c1c8e694cac6dbfe9fcd1eb8ee2019fdc964038e;hpb=203bbaccfaaeac9548862e83792d38509a8c8167;p=ffmpeg diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index c1c8e694cac..b10cd13f8ff 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -23,11 +23,9 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" -#define FF_INTERNAL_FIELDS 1 -#include "libavfilter/framequeue.h" - #include "avfilter.h" #include "drawutils.h" +#include "filters.h" #include "internal.h" #define PLANE_R 0x01 @@ -101,6 +99,8 @@ AVFILTER_DEFINE_CLASS(extractplanes); AV_PIX_FMT_YUV422P12##suf, \ AV_PIX_FMT_YUV444P12##suf, \ AV_PIX_FMT_YUV440P12##suf, \ + AV_PIX_FMT_YUVA422P12##suf, \ + AV_PIX_FMT_YUVA444P12##suf, \ AV_PIX_FMT_GBRP10##suf, AV_PIX_FMT_GBRAP10##suf, \ AV_PIX_FMT_GBRP12##suf, AV_PIX_FMT_GBRAP12##suf, \ AV_PIX_FMT_YUV420P9##suf, \ @@ -143,12 +143,12 @@ static int query_formats(AVFilterContext *ctx) AVFilterFormats *avff; int i, ret, depth = 0, be = 0; - if (!ctx->inputs[0]->in_formats || - !ctx->inputs[0]->in_formats->nb_formats) { + if (!ctx->inputs[0]->incfg.formats || + !ctx->inputs[0]->incfg.formats->nb_formats) { return AVERROR(EAGAIN); } - avff = ctx->inputs[0]->in_formats; + avff = ctx->inputs[0]->incfg.formats; desc = av_pix_fmt_desc_get(avff->formats[0]); depth = desc->comp[0].depth; be = desc->flags & AV_PIX_FMT_FLAG_BE; @@ -157,8 +157,8 @@ static int query_formats(AVFilterContext *ctx) } else { in_pixfmts = in_pixfmts_le; } - if (!ctx->inputs[0]->out_formats) - if ((ret = ff_formats_ref(ff_make_format_list(in_pixfmts), &ctx->inputs[0]->out_formats)) < 0) + if (!ctx->inputs[0]->outcfg.formats) + if ((ret = ff_formats_ref(ff_make_format_list(in_pixfmts), &ctx->inputs[0]->outcfg.formats)) < 0) return ret; for (i = 1; i < avff->nb_formats; i++) { @@ -193,7 +193,7 @@ static int query_formats(AVFilterContext *ctx) out_pixfmts = out16le_pixfmts; for (i = 0; i < ctx->nb_outputs; i++) - if ((ret = ff_formats_ref(ff_make_format_list(out_pixfmts), &ctx->outputs[i]->in_formats)) < 0) + if ((ret = ff_formats_ref(ff_make_format_list(out_pixfmts), &ctx->outputs[i]->incfg.formats)) < 0) return ret; return 0; } @@ -282,7 +282,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) const int idx = s->map[i]; AVFrame *out; - if (outlink->status_in) + if (ff_outlink_get_status(outlink)) continue; out = ff_get_video_buffer(outlink, outlink->w, outlink->h);