virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '88b160a457e491cb9e014630ef5387ad3500258e'

Browse Source 
* commit '88b160a457e491cb9e014630ef5387ad3500258e':
  avfilter: Return more meaningful error codes

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-06 01:04:19 +01:00
commit f455c8fdef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/avfilter.c
View File

@ -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);
}