Commit adfcf16f authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit '5b63b156'

* commit '5b63b156':
  lavfi: set the link hwframes context before configuring the dst input
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 85146dfc 5b63b156
...@@ -316,14 +316,6 @@ int avfilter_config_links(AVFilterContext *filter) ...@@ -316,14 +316,6 @@ int avfilter_config_links(AVFilterContext *filter)
link->time_base = (AVRational) {1, link->sample_rate}; link->time_base = (AVRational) {1, link->sample_rate};
} }
if ((config_link = link->dstpad->config_props))
if ((ret = config_link(link)) < 0) {
av_log(link->dst, AV_LOG_ERROR,
"Failed to configure input pad on %s\n",
link->dst->name);
return ret;
}
if (link->src->nb_inputs && link->src->inputs[0]->hw_frames_ctx && if (link->src->nb_inputs && link->src->inputs[0]->hw_frames_ctx &&
!link->hw_frames_ctx) { !link->hw_frames_ctx) {
AVHWFramesContext *input_ctx = (AVHWFramesContext*)link->src->inputs[0]->hw_frames_ctx->data; AVHWFramesContext *input_ctx = (AVHWFramesContext*)link->src->inputs[0]->hw_frames_ctx->data;
...@@ -335,6 +327,14 @@ int avfilter_config_links(AVFilterContext *filter) ...@@ -335,6 +327,14 @@ int avfilter_config_links(AVFilterContext *filter)
} }
} }
if ((config_link = link->dstpad->config_props))
if ((ret = config_link(link)) < 0) {
av_log(link->dst, AV_LOG_ERROR,
"Failed to configure input pad on %s\n",
link->dst->name);
return ret;
}
link->init_state = AVLINK_INIT; link->init_state = AVLINK_INIT;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment