Unified · Split
| @@ -217,8 +217,6 @@ static av_cold void uninit(AVFilterContext *ctx) · 216 unmodified lines | |||
| 217 | av_frame_free(&s->f1); | 217 | av_frame_free(&s->f1); |
| 218 | } | 218 | } |
| 219 | 219 | ||
| 220 | static int query_formats(AVFilterContext *ctx) | ||
| 221 | { | ||
| 222 | static const enum AVPixelFormat pix_fmts[] = { | 220 | static const enum AVPixelFormat pix_fmts[] = { |
| 223 | AV_PIX_FMT_YUV410P, | 221 | AV_PIX_FMT_YUV410P, |
| 224 | AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUVJ411P, | 222 | AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUVJ411P, |
| @@ -232,9 +230,6 @@ static int query_formats(AVFilterContext *ctx) · 7 unmodified lines | |||
| 232 | AV_PIX_FMT_NONE | 230 | AV_PIX_FMT_NONE |
| 233 | }; | 231 | }; |
| 234 | 232 | ||
| 235 | return ff_set_common_formats_from_list(ctx, pix_fmts); | ||
| 236 | } | ||
| 237 | |||
| 238 | #define BLEND_FRAME_FUNC(nbits) \ | 233 | #define BLEND_FRAME_FUNC(nbits) \ |
| 239 | static void blend_frames##nbits##_c(BLEND_FUNC_PARAMS) \ | 234 | static void blend_frames##nbits##_c(BLEND_FUNC_PARAMS) \ |
| 240 | { \ | 235 | { \ |
| @@ -446,7 +441,7 @@ const AVFilter ff_vf_framerate = { · 205 unmodified lines | |||
| 446 | .uninit = uninit, | 441 | .uninit = uninit, |
| 447 | FILTER_INPUTS(framerate_inputs), | 442 | FILTER_INPUTS(framerate_inputs), |
| 448 | FILTER_OUTPUTS(framerate_outputs), | 443 | FILTER_OUTPUTS(framerate_outputs), |
| 449 | FILTER_QUERY_FUNC(query_formats), | 444 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 450 | .flags = AVFILTER_FLAG_SLICE_THREADS, | 445 | .flags = AVFILTER_FLAG_SLICE_THREADS, |
| 451 | .activate = activate, | 446 | .activate = activate, |
| 452 | }; | 447 | }; |