Make link_filter() propagate the generated error code.
Originally committed as revision 24419 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		@@ -34,11 +34,12 @@ static int link_filter(AVFilterContext *src, int srcpad,
 | 
				
			|||||||
                       AVFilterContext *dst, int dstpad,
 | 
					                       AVFilterContext *dst, int dstpad,
 | 
				
			||||||
                       AVClass *log_ctx)
 | 
					                       AVClass *log_ctx)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if (avfilter_link(src, srcpad, dst, dstpad)) {
 | 
					    int ret;
 | 
				
			||||||
 | 
					    if ((ret = avfilter_link(src, srcpad, dst, dstpad))) {
 | 
				
			||||||
        av_log(log_ctx, AV_LOG_ERROR,
 | 
					        av_log(log_ctx, AV_LOG_ERROR,
 | 
				
			||||||
               "cannot create the link %s:%d -> %s:%d\n",
 | 
					               "cannot create the link %s:%d -> %s:%d\n",
 | 
				
			||||||
               src->filter->name, srcpad, dst->filter->name, dstpad);
 | 
					               src->filter->name, srcpad, dst->filter->name, dstpad);
 | 
				
			||||||
        return -1;
 | 
					        return ret;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return 0;
 | 
					    return 0;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user