X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_overlay_qsv.c;h=7a4afd77d4921f3a6a389c16940b89c98d36cbac;hb=a04ad248a05e7b613abe09b3bb067f555108d794;hp=20871786eea419b0526fa54abd7d1e82a280a539;hpb=23ce57af3ad684363881cdd66d5724f40963a65c;p=ffmpeg diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c index 20871786eea..7a4afd77d49 100644 --- a/libavfilter/vf_overlay_qsv.c +++ b/libavfilter/vf_overlay_qsv.c @@ -160,7 +160,7 @@ release: static int have_alpha_planar(AVFilterLink *link) { - enum AVPixelFormat pix_fmt; + enum AVPixelFormat pix_fmt = link->format; const AVPixFmtDescriptor *desc; AVHWFramesContext *fctx; @@ -345,7 +345,7 @@ static int overlay_qsv_init(AVFilterContext *ctx) return 0; } -static void overlay_qsv_uninit(AVFilterContext *ctx) +static av_cold void overlay_qsv_uninit(AVFilterContext *ctx) { QSVOverlayContext *vpp = ctx->priv; @@ -381,12 +381,12 @@ static int overlay_qsv_query_formats(AVFilterContext *ctx) }; for (i = 0; i < ctx->nb_inputs; i++) { - ret = ff_formats_ref(ff_make_format_list(main_in_fmts), &ctx->inputs[i]->out_formats); + ret = ff_formats_ref(ff_make_format_list(main_in_fmts), &ctx->inputs[i]->outcfg.formats); if (ret < 0) return ret; } - ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->in_formats); + ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->incfg.formats); if (ret < 0) return ret; @@ -398,13 +398,11 @@ static const AVFilterPad overlay_qsv_inputs[] = { .name = "main", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_main_input, - .needs_fifo = 1, }, { .name = "overlay", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_overlay_input, - .needs_fifo = 1, }, { NULL } }; @@ -418,7 +416,7 @@ static const AVFilterPad overlay_qsv_outputs[] = { { NULL } }; -AVFilter ff_vf_overlay_qsv = { +const AVFilter ff_vf_overlay_qsv = { .name = "overlay_qsv", .description = NULL_IF_CONFIG_SMALL("Quick Sync Video overlay."), .priv_size = sizeof(QSVOverlayContext),