[FFmpeg-cvslog] lavfi: set the link hwframes context before configuring the dst input
Anton Khirnov
git at videolan.org
Fri Oct 7 14:30:27 EEST 2016
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Jun 21 19:39:51 2016 +0200| [5b63b15663d31f50ce45d980b904a68795ad3f7a] | committer: Anton Khirnov
lavfi: set the link hwframes context before configuring the dst input
The destination filter might expect the hw frames context to be already
set (this is the case e.g. for hwdownload).
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b63b15663d31f50ce45d980b904a68795ad3f7a
---
libavfilter/avfilter.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 190d8ab..1cedb15 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -211,14 +211,6 @@ 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;
- }
-
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;
@@ -230,6 +222,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;
}
}
More information about the ffmpeg-cvslog
mailing list