diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 14:29:11 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 14:29:11 +0300 |
commit | adfcf16f76de675f1dd313bc64ec52f2e143732b (patch) | |
tree | fffa13cd5b77d9ce6ef6547017e4bab476b0f19f /libavfilter | |
parent | 85146dfc23d39caf0167158cee2b6786a2616fff (diff) | |
parent | 5b63b15663d31f50ce45d980b904a68795ad3f7a (diff) |
Merge commit '5b63b15663d31f50ce45d980b904a68795ad3f7a'
* commit '5b63b15663d31f50ce45d980b904a68795ad3f7a':
lavfi: set the link hwframes context before configuring the dst input
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/avfilter.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index b2365354a2..1d469c3334 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -316,14 +316,6 @@ int avfilter_config_links(AVFilterContext *filter) 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 && !link->hw_frames_ctx) { AVHWFramesContext *input_ctx = (AVHWFramesContext*)link->src->inputs[0]->hw_frames_ctx->data; @@ -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; } } |