mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 12:09:55 +00:00
Make avfilter_config_links() propagate the error code coming from the
callee functions. Originally committed as revision 25433 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e4dccc0d59
commit
69f73a8928
@ -156,6 +156,7 @@ int avfilter_config_links(AVFilterContext *filter)
|
||||
{
|
||||
int (*config_link)(AVFilterLink *);
|
||||
unsigned i;
|
||||
int ret;
|
||||
|
||||
for (i = 0; i < filter->input_count; i ++) {
|
||||
AVFilterLink *link = filter->inputs[i];
|
||||
@ -171,17 +172,17 @@ int avfilter_config_links(AVFilterContext *filter)
|
||||
case AVLINK_UNINIT:
|
||||
link->init_state = AVLINK_STARTINIT;
|
||||
|
||||
if (avfilter_config_links(link->src))
|
||||
return -1;
|
||||
if ((ret = avfilter_config_links(link->src)) < 0)
|
||||
return ret;
|
||||
|
||||
if (!(config_link = link->srcpad->config_props))
|
||||
config_link = avfilter_default_config_output_link;
|
||||
if (config_link(link))
|
||||
return -1;
|
||||
if ((ret = config_link(link)) < 0)
|
||||
return ret;
|
||||
|
||||
if ((config_link = link->dstpad->config_props))
|
||||
if (config_link(link))
|
||||
return -1;
|
||||
if ((ret = config_link(link)) < 0)
|
||||
return ret;
|
||||
|
||||
link->init_state = AVLINK_INIT;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user