Unified · Split
| @@ -336,9 +336,11 @@ end: · 335 unmodified lines | |||
| 336 | return ret; | 336 | return ret; |
| 337 | } | 337 | } |
| 338 | 338 | ||
| 339 | static int geq_query_formats(AVFilterContext *ctx) | 339 | static int geq_query_formats(const AVFilterContext *ctx, |
| 340 | AVFilterFormatsConfig **cfg_in, | ||
| 341 | AVFilterFormatsConfig **cfg_out) | ||
| 340 | { | 342 | { |
| 341 | GEQContext *geq = ctx->priv; | 343 | const GEQContext *geq = ctx->priv; |
| 342 | static const enum AVPixelFormat yuv_pix_fmts[] = { | 344 | static const enum AVPixelFormat yuv_pix_fmts[] = { |
| 343 | AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, | 345 | AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, |
| 344 | AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P, | 346 | AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P, |
| @@ -371,7 +373,7 @@ static int geq_query_formats(AVFilterContext *ctx) · 26 unmodified lines | |||
| 371 | }; | 373 | }; |
| 372 | const enum AVPixelFormat *pix_fmts = geq->is_rgb ? rgb_pix_fmts : yuv_pix_fmts; | 374 | const enum AVPixelFormat *pix_fmts = geq->is_rgb ? rgb_pix_fmts : yuv_pix_fmts; |
| 373 | 375 | ||
| 374 | return ff_set_common_formats_from_list(ctx, pix_fmts); | 376 | return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts); |
| 375 | } | 377 | } |
| 376 | 378 | ||
| 377 | static int geq_config_props(AVFilterLink *inlink) | 379 | static int geq_config_props(AVFilterLink *inlink) |
| @@ -532,7 +534,7 @@ const AVFilter ff_vf_geq = { · 154 unmodified lines | |||
| 532 | .uninit = geq_uninit, | 534 | .uninit = geq_uninit, |
| 533 | FILTER_INPUTS(geq_inputs), | 535 | FILTER_INPUTS(geq_inputs), |
| 534 | FILTER_OUTPUTS(ff_video_default_filterpad), | 536 | FILTER_OUTPUTS(ff_video_default_filterpad), |
| 535 | FILTER_QUERY_FUNC(geq_query_formats), | 537 | FILTER_QUERY_FUNC2(geq_query_formats), |
| 536 | .priv_class = &geq_class, | 538 | .priv_class = &geq_class, |
| 537 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, | 539 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, |
| 538 | }; | 540 | }; |