* commit '88b160a457e491cb9e014630ef5387ad3500258e': avfilter: Return more meaningful error codes Conflicts: libavfilter/avfilter.c
Unified · Split
| @@ -135,7 +135,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, · 134 unmodified lines | |||
| 135 | 135 | ||
| 136 | if (src->nb_outputs <= srcpad || dst->nb_inputs <= dstpad || | 136 | if (src->nb_outputs <= srcpad || dst->nb_inputs <= dstpad || |
| 137 | src->outputs[srcpad] || dst->inputs[dstpad]) | 137 | src->outputs[srcpad] || dst->inputs[dstpad]) |
| 138 | return -1; | 138 | return AVERROR(EINVAL); |
| 139 | 139 | ||
| 140 | if (src->output_pads[srcpad].type != dst->input_pads[dstpad].type) { | 140 | if (src->output_pads[srcpad].type != dst->input_pads[dstpad].type) { |
| 141 | av_log(src, AV_LOG_ERROR, | 141 | av_log(src, AV_LOG_ERROR, |
| @@ -381,7 +381,7 @@ int ff_poll_frame(AVFilterLink *link) · 239 unmodified lines | |||
| 381 | for (i = 0; i < link->src->nb_inputs; i++) { | 381 | for (i = 0; i < link->src->nb_inputs; i++) { |
| 382 | int val; | 382 | int val; |
| 383 | if (!link->src->inputs[i]) | 383 | if (!link->src->inputs[i]) |
| 384 | return -1; | 384 | return AVERROR(EINVAL); |
| 385 | val = ff_poll_frame(link->src->inputs[i]); | 385 | val = ff_poll_frame(link->src->inputs[i]); |
| 386 | min = FFMIN(min, val); | 386 | min = FFMIN(min, val); |
| 387 | } | 387 | } |