* commit '5b63b15663d31f50ce45d980b904a68795ad3f7a': lavfi: set the link hwframes context before configuring the dst input
Unified · Split
| @@ -316,14 +316,6 @@ int avfilter_config_links(AVFilterContext *filter) · 315 unmodified lines | ||
| 316 | 316 | link->time_base = (AVRational) {1, link->sample_rate}; |
| 317 | 317 | } |
| 318 | 318 | |
| 319 | − if ((config_link = link->dstpad->config_props)) | |
| 320 | − if ((ret = config_link(link)) < 0) { | |
| 321 | − av_log(link->dst, AV_LOG_ERROR, | |
| 322 | − "Failed to configure input pad on %s\n", | |
| 323 | − link->dst->name); | |
| 324 | − return ret; | |
| 325 | − } | |
| 326 | − | |
| 327 | 319 | if (link->src->nb_inputs && link->src->inputs[0]->hw_frames_ctx && |
| 328 | 320 | !link->hw_frames_ctx) { |
| 329 | 321 | AVHWFramesContext *input_ctx = (AVHWFramesContext*)link->src->inputs[0]->hw_frames_ctx->data; |
| @@ -335,6 +327,14 @@ int avfilter_config_links(AVFilterContext *filter) · 5 unmodified lines | ||
| 335 | 327 | } |
| 336 | 328 | } |
| 337 | 329 | |
| 330 | + if ((config_link = link->dstpad->config_props)) | |
| 331 | + if ((ret = config_link(link)) < 0) { | |
| 332 | + av_log(link->dst, AV_LOG_ERROR, | |
| 333 | + "Failed to configure input pad on %s\n", | |
| 334 | + link->dst->name); | |
| 335 | + return ret; | |
| 336 | + } | |
| 337 | + | |
| 338 | 338 | link->init_state = AVLINK_INIT; |
| 339 | 339 | } |
| 340 | 340 | } |