videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-01 17:02:14 +02:00
Code Releases Activity

avfilter/vf_maskedmerge: Use formats list instead of query function

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-27 21:36:09 +02:00
parent 76effaa938
commit e0e3c2f5d1
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/vf_maskedmerge.c
View File

@ -37,8 +37,6 @@ static const AVOption maskedmerge_options[] = {
AVFILTER_DEFINE_CLASS(maskedmerge);
static int query_formats(AVFilterContext *ctx)
{
static const enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P,
AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P,
@ -61,9 +59,6 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_NONE
};
return ff_set_common_formats_from_list(ctx, pix_fmts);
}
typedef struct ThreadData {
AVFrame *base, *overlay, *mask;
AVFrame *out;
@ -318,7 +313,7 @@ const AVFilter ff_vf_maskedmerge = {
.activate = activate,
FILTER_INPUTS(maskedmerge_inputs),
FILTER_OUTPUTS(maskedmerge_outputs),
FILTER_QUERY_FUNC(query_formats),
FILTER_PIXFMTS_ARRAY(pix_fmts),
.priv_class = &maskedmerge_class,
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,
.process_command = ff_filter_process_command,