diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-06 01:04:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-06 01:16:47 +0100 |
| commit | f455c8fdef0a28facff05b509b0958ffb9604e10 (patch) | |
| tree | d22b5ca1a16267c2d7e10a99a3652cc8e0b6e3d0 | |
| parent | 98d19ca8f18901b89aae66dc11c20f5a3a39d7b5 (diff) | |
| parent | 88b160a457e491cb9e014630ef5387ad3500258e (diff) | |
| download | ffmpeg-f455c8fdef0a28facff05b509b0958ffb9604e10.tar.gz | |
Merge commit '88b160a457e491cb9e014630ef5387ad3500258e'
* commit '88b160a457e491cb9e014630ef5387ad3500258e':
avfilter: Return more meaningful error codes
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/avfilter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 1b5cc2f64e..bcf8d3f91f 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -135,7 +135,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, if (src->nb_outputs <= srcpad || dst->nb_inputs <= dstpad || src->outputs[srcpad] || dst->inputs[dstpad]) - return -1; + return AVERROR(EINVAL); if (src->output_pads[srcpad].type != dst->input_pads[dstpad].type) { av_log(src, AV_LOG_ERROR, @@ -381,7 +381,7 @@ int ff_poll_frame(AVFilterLink *link) for (i = 0; i < link->src->nb_inputs; i++) { int val; if (!link->src->inputs[i]) - return -1; + return AVERROR(EINVAL); val = ff_poll_frame(link->src->inputs[i]); min = FFMIN(min, val); } |