Unified · Split
| @@ -117,8 +117,6 @@ typedef struct ThreadData { · 116 unmodified lines | |||
| 117 | float progress; | 117 | float progress; |
| 118 | } ThreadData; | 118 | } ThreadData; |
| 119 | 119 | ||
| 120 | static int query_formats(AVFilterContext *ctx) | ||
| 121 | { | ||
| 122 | static const enum AVPixelFormat pix_fmts[] = { | 120 | static const enum AVPixelFormat pix_fmts[] = { |
| 123 | AV_PIX_FMT_YUVA444P, | 121 | AV_PIX_FMT_YUVA444P, |
| 124 | AV_PIX_FMT_YUVJ444P, | 122 | AV_PIX_FMT_YUVJ444P, |
| @@ -138,9 +136,6 @@ static int query_formats(AVFilterContext *ctx) · 13 unmodified lines | |||
| 138 | AV_PIX_FMT_NONE | 136 | AV_PIX_FMT_NONE |
| 139 | }; | 137 | }; |
| 140 | 138 | ||
| 141 | return ff_set_common_formats_from_list(ctx, pix_fmts); | ||
| 142 | } | ||
| 143 | |||
| 144 | static av_cold void uninit(AVFilterContext *ctx) | 139 | static av_cold void uninit(AVFilterContext *ctx) |
| 145 | { | 140 | { |
| 146 | XFadeContext *s = ctx->priv; | 141 | XFadeContext *s = ctx->priv; |
| @@ -2005,6 +2000,6 @@ const AVFilter ff_vf_xfade = { · 1858 unmodified lines | |||
| 2005 | .uninit = uninit, | 2000 | .uninit = uninit, |
| 2006 | FILTER_INPUTS(xfade_inputs), | 2001 | FILTER_INPUTS(xfade_inputs), |
| 2007 | FILTER_OUTPUTS(xfade_outputs), | 2002 | FILTER_OUTPUTS(xfade_outputs), |
| 2008 | FILTER_QUERY_FUNC(query_formats), | 2003 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 2009 | .flags = AVFILTER_FLAG_SLICE_THREADS, | 2004 | .flags = AVFILTER_FLAG_SLICE_THREADS, |
| 2010 | }; | 2005 | }; |