Unified · Split
| @@ -144,8 +144,6 @@ static const AVOption morpho_options[] = { · 143 unmodified lines | |||
| 144 | 144 | ||
| 145 | FRAMESYNC_DEFINE_CLASS(morpho, MorphoContext, fs); | 145 | FRAMESYNC_DEFINE_CLASS(morpho, MorphoContext, fs); |
| 146 | 146 | ||
| 147 | static int query_formats(AVFilterContext *ctx) | ||
| 148 | { | ||
| 149 | static const enum AVPixelFormat pix_fmts[] = { | 147 | static const enum AVPixelFormat pix_fmts[] = { |
| 150 | AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, | 148 | AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, |
| 151 | AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, | 149 | AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, |
| @@ -168,9 +166,6 @@ static int query_formats(AVFilterContext *ctx) · 16 unmodified lines | |||
| 168 | AV_PIX_FMT_NONE | 166 | AV_PIX_FMT_NONE |
| 169 | }; | 167 | }; |
| 170 | 168 | ||
| 171 | return ff_set_common_formats_from_list(ctx, pix_fmts); | ||
| 172 | } | ||
| 173 | |||
| 174 | static void min_fun(uint8_t *c, const uint8_t *a, const uint8_t *b, int x) | 169 | static void min_fun(uint8_t *c, const uint8_t *a, const uint8_t *b, int x) |
| 175 | { | 170 | { |
| 176 | for (int i = 0; i < x; i++) | 171 | for (int i = 0; i < x; i++) |
| @@ -1026,7 +1021,7 @@ const AVFilter ff_vf_morpho = { · 849 unmodified lines | |||
| 1026 | .uninit = uninit, | 1021 | .uninit = uninit, |
| 1027 | FILTER_INPUTS(morpho_inputs), | 1022 | FILTER_INPUTS(morpho_inputs), |
| 1028 | FILTER_OUTPUTS(morpho_outputs), | 1023 | FILTER_OUTPUTS(morpho_outputs), |
| 1029 | FILTER_QUERY_FUNC(query_formats), | 1024 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 1030 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, | 1025 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, |
| 1031 | .process_command = ff_filter_process_command, | 1026 | .process_command = ff_filter_process_command, |
| 1032 | }; | 1027 | }; |