X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_overlay_qsv.c;h=6c3efdbeb5f5aa83488eb3fd009f3d063190f852;hb=1da9851e3470a019a35793c913a1de07f75dc3fc;hp=471576e35a235f1d0f90ba19ca782c47df0123e1;hpb=643e3369369f77035a6c03a50752416d26cbf947;p=ffmpeg diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c index 471576e35a2..6c3efdbeb5f 100644 --- a/libavfilter/vf_overlay_qsv.c +++ b/libavfilter/vf_overlay_qsv.c @@ -42,7 +42,7 @@ #define OVERLAY 1 #define OFFSET(x) offsetof(QSVOverlayContext, x) -#define FLAGS AV_OPT_FLAG_VIDEO_PARAM +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM) enum var_name { VAR_MAIN_iW, VAR_MW, @@ -415,6 +415,7 @@ static void overlay_qsv_uninit(AVFilterContext *ctx) static int overlay_qsv_query_formats(AVFilterContext *ctx) { int i; + int ret; static const enum AVPixelFormat main_in_fmts[] = { AV_PIX_FMT_YUV420P, @@ -430,10 +431,15 @@ static int overlay_qsv_query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - for (i = 0; i < ctx->nb_inputs; i++) - ff_formats_ref(ff_make_format_list(main_in_fmts), &ctx->inputs[i]->out_formats); + for (i = 0; i < ctx->nb_inputs; i++) { + ret = ff_formats_ref(ff_make_format_list(main_in_fmts), &ctx->inputs[i]->out_formats); + if (ret < 0) + return 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]->in_formats); + if (ret < 0) + return ret; return 0; }