History

Merge commit '88b160a457e491cb9e014630ef5387ad3500258e'

* commit '88b160a457e491cb9e014630ef5387ad3500258e': avfilter: Return more meaningful error codes Conflicts: libavfilter/avfilter.c

Michael Niedermayer committed 11 years ago

Commit f455c8f2 parents 98d19ca 88b160a1 file · +2 −2Browse files

Showing the changes to libavfilter/avfilter.c (1 of 1 file). Show all

Unified · Split

libavfilter/avfilter.c+2−2
@@ -135,7 +135,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, · 134 unmodified lines
135135
136136 if (src->nb_outputs <= srcpad || dst->nb_inputs <= dstpad ||
137137 src->outputs[srcpad] || dst->inputs[dstpad])
138− return -1;
138+ return AVERROR(EINVAL);
139139
140140 if (src->output_pads[srcpad].type != dst->input_pads[dstpad].type) {
141141 av_log(src, AV_LOG_ERROR,
@@ -381,7 +381,7 @@ int ff_poll_frame(AVFilterLink *link) · 239 unmodified lines
381381 for (i = 0; i < link->src->nb_inputs; i++) {
382382 int val;
383383 if (!link->src->inputs[i])
384− return -1;
384+ return AVERROR(EINVAL);
385385 val = ff_poll_frame(link->src->inputs[i]);
386386 min = FFMIN(min, val);
387387 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t