af_amix: only consider negative return codes as errors.

pull/59/head
Anton Khirnov 13 years ago
parent 53ddd43f0c
commit 428b369804
  1. 4
      libavfilter/af_amix.c

@ -360,7 +360,7 @@ static int request_samples(AVFilterContext *ctx, int min_samples)
s->input_state[i] = INPUT_OFF; s->input_state[i] = INPUT_OFF;
continue; continue;
} }
} else if (ret) } else if (ret < 0)
return ret; return ret;
} }
return 0; return 0;
@ -422,7 +422,7 @@ static int request_frame(AVFilterLink *outlink)
return AVERROR_EOF; return AVERROR_EOF;
else else
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
} else if (ret) } else if (ret < 0)
return ret; return ret;
} }
av_assert0(s->frame_list->nb_frames > 0); av_assert0(s->frame_list->nb_frames > 0);

Loading…
Cancel
Save