highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter: Return more meaningful error codes

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Himangi Saraogi
2015-02-23 09:51:16 +05:30
committed by Diego Biurrun
parent ad786dd450
commit 88b160a457
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/avfilter.c
View File

@@ -79,7 +79,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad,
if (src->nb_outputs <= srcpad || dst->nb_inputs <= dstpad || if (src->nb_outputs <= srcpad || dst->nb_inputs <= dstpad ||
src->outputs[srcpad] || dst->inputs[dstpad]) src->outputs[srcpad] || dst->inputs[dstpad])
return -1; return AVERROR(EINVAL);
if (src->output_pads[srcpad].type != dst->input_pads[dstpad].type) { if (src->output_pads[srcpad].type != dst->input_pads[dstpad].type) {
av_log(src, AV_LOG_ERROR, av_log(src, AV_LOG_ERROR,
@@ -254,7 +254,8 @@ int ff_request_frame(AVFilterLink *link)
return link->srcpad->request_frame(link); return link->srcpad->request_frame(link);
else if (link->src->inputs[0]) else if (link->src->inputs[0])
return ff_request_frame(link->src->inputs[0]); return ff_request_frame(link->src->inputs[0]);
else return -1; else
return AVERROR(EINVAL);
} }
int ff_poll_frame(AVFilterLink *link) int ff_poll_frame(AVFilterLink *link)
@@ -267,7 +268,7 @@ int ff_poll_frame(AVFilterLink *link)
for (i = 0; i < link->src->nb_inputs; i++) { for (i = 0; i < link->src->nb_inputs; i++) {
int val; int val;
if (!link->src->inputs[i]) if (!link->src->inputs[i])
return -1; return AVERROR(EINVAL);
val = ff_poll_frame(link->src->inputs[i]); val = ff_poll_frame(link->src->inputs[i]);
min = FFMIN(min, val); min = FFMIN(min, val);
} }