Unified · Split
| @@ -43,8 +43,6 @@ static const AVOption threshold_options[] = { · 42 unmodified lines | |||
| 43 | 43 | ||
| 44 | AVFILTER_DEFINE_CLASS(threshold); | 44 | AVFILTER_DEFINE_CLASS(threshold); |
| 45 | 45 | ||
| 46 | static int query_formats(AVFilterContext *ctx) | ||
| 47 | { | ||
| 48 | static const enum AVPixelFormat pix_fmts[] = { | 46 | static const enum AVPixelFormat pix_fmts[] = { |
| 49 | AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, | 47 | AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, |
| 50 | AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, | 48 | AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, |
| @@ -67,9 +65,6 @@ static int query_formats(AVFilterContext *ctx) · 16 unmodified lines | |||
| 67 | AV_PIX_FMT_NONE | 65 | AV_PIX_FMT_NONE |
| 68 | }; | 66 | }; |
| 69 | 67 | ||
| 70 | return ff_set_common_formats_from_list(ctx, pix_fmts); | ||
| 71 | } | ||
| 72 | |||
| 73 | typedef struct ThreadData { | 68 | typedef struct ThreadData { |
| 74 | AVFrame *in; | 69 | AVFrame *in; |
| 75 | AVFrame *threshold; | 70 | AVFrame *threshold; |
| @@ -355,7 +350,7 @@ const AVFilter ff_vf_threshold = { · 279 unmodified lines | |||
| 355 | .activate = activate, | 350 | .activate = activate, |
| 356 | FILTER_INPUTS(inputs), | 351 | FILTER_INPUTS(inputs), |
| 357 | FILTER_OUTPUTS(outputs), | 352 | FILTER_OUTPUTS(outputs), |
| 358 | FILTER_QUERY_FUNC(query_formats), | 353 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 359 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, | 354 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, |
| 360 | .process_command = ff_filter_process_command, | 355 | .process_command = ff_filter_process_command, |
| 361 | }; | 356 | }; |