diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-12 20:44:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-12 20:44:57 +0200 |
| commit | dc1c79be1bfc76839b1fd277a55e6baad4379498 (patch) | |
| tree | d2c7f66e872b9bcb1b0816a31ba5b13deecd7e8b /libavfilter/avfilter.c | |
| parent | 2a622c2369e399907297465b14328b2389bb524c (diff) | |
| parent | 65a80ee1ec854dc4e5d090fa5b2be9afeae312d3 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfilter: Log an error if avfilter fails to configure a link.
avconv: support only native pthreads.
rtmp: Fix a possible access to invalid memory location when the playpath is too short.
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index f8fc483bd9..65ad457384 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -231,8 +231,12 @@ int avfilter_config_links(AVFilterContext *filter) "callbacks on all outputs\n"); return AVERROR(EINVAL); } - } else if ((ret = config_link(link)) < 0) + } else if ((ret = config_link(link)) < 0) { + av_log(link->src, AV_LOG_ERROR, + "Failed to configure output pad on %s\n", + link->src->name); return ret; + } switch (link->type) { case AVMEDIA_TYPE_VIDEO: @@ -277,8 +281,12 @@ int avfilter_config_links(AVFilterContext *filter) } if ((config_link = link->dstpad->config_props)) - if ((ret = config_link(link)) < 0) + if ((ret = config_link(link)) < 0) { + av_log(link->src, AV_LOG_ERROR, + "Failed to configure input pad on %s\n", + link->dst->name); return ret; + } link->init_state = AVLINK_INIT; } |