Unified · Split
| @@ -52,7 +52,9 @@ static av_cold void cudaupload_uninit(AVFilterContext *ctx) · 51 unmodified lines | |||
| 52 | av_buffer_unref(&s->hwdevice); | 52 | av_buffer_unref(&s->hwdevice); |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | static int cudaupload_query_formats(AVFilterContext *ctx) | 55 | static int cudaupload_query_formats(const AVFilterContext *ctx, |
| 56 | AVFilterFormatsConfig **cfg_in, | ||
| 57 | AVFilterFormatsConfig **cfg_out) | ||
| 56 | { | 58 | { |
| 57 | int ret; | 59 | int ret; |
| 58 | 60 | ||
| @@ -71,13 +73,13 @@ static int cudaupload_query_formats(AVFilterContext *ctx) · 12 unmodified lines | |||
| 71 | AVFilterFormats *in_fmts = ff_make_format_list(input_pix_fmts); | 73 | AVFilterFormats *in_fmts = ff_make_format_list(input_pix_fmts); |
| 72 | AVFilterFormats *out_fmts; | 74 | AVFilterFormats *out_fmts; |
| 73 | 75 | ||
| 74 | ret = ff_formats_ref(in_fmts, &ctx->inputs[0]->outcfg.formats); | 76 | ret = ff_formats_ref(in_fmts, &cfg_in[0]->formats); |
| 75 | if (ret < 0) | 77 | if (ret < 0) |
| 76 | return ret; | 78 | return ret; |
| 77 | 79 | ||
| 78 | out_fmts = ff_make_format_list(output_pix_fmts); | 80 | out_fmts = ff_make_format_list(output_pix_fmts); |
| 79 | 81 | ||
| 80 | ret = ff_formats_ref(out_fmts, &ctx->outputs[0]->incfg.formats); | 82 | ret = ff_formats_ref(out_fmts, &cfg_out[0]->formats); |
| 81 | if (ret < 0) | 83 | if (ret < 0) |
| 82 | return ret; | 84 | return ret; |
| 83 | 85 | ||
| @@ -196,7 +198,7 @@ const AVFilter ff_vf_hwupload_cuda = { · 112 unmodified lines | |||
| 196 | FILTER_INPUTS(cudaupload_inputs), | 198 | FILTER_INPUTS(cudaupload_inputs), |
| 197 | FILTER_OUTPUTS(cudaupload_outputs), | 199 | FILTER_OUTPUTS(cudaupload_outputs), |
| 198 | 200 | ||
| 199 | FILTER_QUERY_FUNC(cudaupload_query_formats), | 201 | FILTER_QUERY_FUNC2(cudaupload_query_formats), |
| 200 | 202 | ||
| 201 | .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, | 203 | .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, |
| 202 | }; | 204 | }; |