Unified · Split
| @@ -671,7 +671,9 @@ static int request_frame(AVFilterLink *outlink) · 670 unmodified lines | |||
| 671 | return ff_filter_frame(outlink, frame); | 671 | return ff_filter_frame(outlink, frame); |
| 672 | } | 672 | } |
| 673 | 673 | ||
| 674 | static int qrencodesrc_query_formats(AVFilterContext *ctx) | 674 | static int qrencodesrc_query_formats(const AVFilterContext *ctx, |
| 675 | AVFilterFormatsConfig **cfg_in, | ||
| 676 | AVFilterFormatsConfig **cfg_out) | ||
| 675 | { | 677 | { |
| 676 | enum AVPixelFormat pix_fmt; | 678 | enum AVPixelFormat pix_fmt; |
| 677 | FFDrawContext draw; | 679 | FFDrawContext draw; |
| @@ -686,7 +688,7 @@ static int qrencodesrc_query_formats(AVFilterContext *ctx) · 8 unmodified lines | |||
| 686 | (ret = ff_add_format(&fmts, pix_fmt)) < 0) | 688 | (ret = ff_add_format(&fmts, pix_fmt)) < 0) |
| 687 | return ret; | 689 | return ret; |
| 688 | 690 | ||
| 689 | return ff_set_common_formats(ctx, fmts); | 691 | return ff_set_common_formats2(ctx, cfg_in, cfg_out, fmts); |
| 690 | } | 692 | } |
| 691 | 693 | ||
| 692 | static const AVFilterPad qrencodesrc_outputs[] = { | 694 | static const AVFilterPad qrencodesrc_outputs[] = { |
| @@ -707,7 +709,7 @@ const AVFilter ff_vsrc_qrencodesrc = { · 14 unmodified lines | |||
| 707 | .uninit = uninit, | 709 | .uninit = uninit, |
| 708 | .inputs = NULL, | 710 | .inputs = NULL, |
| 709 | FILTER_OUTPUTS(qrencodesrc_outputs), | 711 | FILTER_OUTPUTS(qrencodesrc_outputs), |
| 710 | FILTER_QUERY_FUNC(qrencodesrc_query_formats), | 712 | FILTER_QUERY_FUNC2(qrencodesrc_query_formats), |
| 711 | }; | 713 | }; |
| 712 | 714 | ||
| 713 | #endif // CONFIG_QRENCODESRC_FILTER | 715 | #endif // CONFIG_QRENCODESRC_FILTER |
| @@ -772,9 +774,11 @@ static int qrencode_config_input(AVFilterLink *inlink) · 58 unmodified lines | |||
| 772 | return 0; | 774 | return 0; |
| 773 | } | 775 | } |
| 774 | 776 | ||
| 775 | static int qrencode_query_formats(AVFilterContext *ctx) | 777 | static int qrencode_query_formats(const AVFilterContext *ctx, |
| 778 | AVFilterFormatsConfig **cfg_in, | ||
| 779 | AVFilterFormatsConfig **cfg_out) | ||
| 776 | { | 780 | { |
| 777 | return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); | 781 | return ff_set_common_formats2(ctx, cfg_in, cfg_out, ff_draw_supported_pixel_formats(0)); |
| 778 | } | 782 | } |
| 779 | 783 | ||
| 780 | static int filter_frame(AVFilterLink *inlink, AVFrame *frame) | 784 | static int filter_frame(AVFilterLink *inlink, AVFrame *frame) |
| @@ -818,7 +822,7 @@ const AVFilter ff_vf_qrencode = { · 37 unmodified lines | |||
| 818 | .uninit = uninit, | 822 | .uninit = uninit, |
| 819 | FILTER_INPUTS(avfilter_vf_qrencode_inputs), | 823 | FILTER_INPUTS(avfilter_vf_qrencode_inputs), |
| 820 | FILTER_OUTPUTS(ff_video_default_filterpad), | 824 | FILTER_OUTPUTS(ff_video_default_filterpad), |
| 821 | FILTER_QUERY_FUNC(qrencode_query_formats), | 825 | FILTER_QUERY_FUNC2(qrencode_query_formats), |
| 822 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, | 826 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, |
| 823 | }; | 827 | }; |
| 824 | 828 | ||