virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Make avfilter_config_links() propagate the error code coming from the

Browse Source 
callee functions.

Originally committed as revision 25433 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-10-10 18:54:39 +00:00
parent e4dccc0d59
commit 69f73a8928
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/avfilter.c
View File

@ -156,6 +156,7 @@ int avfilter_config_links(AVFilterContext *filter)
{ {
int (*config_link)(AVFilterLink *); int (*config_link)(AVFilterLink *);
unsigned i; unsigned i;
int ret;
for (i = 0; i < filter->input_count; i ++) { for (i = 0; i < filter->input_count; i ++) {
AVFilterLink *link = filter->inputs[i]; AVFilterLink *link = filter->inputs[i];
@ -171,17 +172,17 @@ int avfilter_config_links(AVFilterContext *filter)
case AVLINK_UNINIT: case AVLINK_UNINIT:
link->init_state = AVLINK_STARTINIT; link->init_state = AVLINK_STARTINIT;
if (avfilter_config_links(link->src)) if ((ret = avfilter_config_links(link->src)) < 0)
return -1; return ret;
if (!(config_link = link->srcpad->config_props)) if (!(config_link = link->srcpad->config_props))
config_link = avfilter_default_config_output_link; config_link = avfilter_default_config_output_link;
if (config_link(link)) if ((ret = config_link(link)) < 0)
return -1; return ret;
if ((config_link = link->dstpad->config_props)) if ((config_link = link->dstpad->config_props))
if (config_link(link)) if ((ret = config_link(link)) < 0)
return -1; return ret;
link->init_state = AVLINK_INIT; link->init_state = AVLINK_INIT;
} }