diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-07-04 18:55:14 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-07-06 13:51:58 +0200 |
| commit | 428b369804d1a0ea7212409e800324ce284e9d55 (patch) | |
| tree | 07a6acebb31889f5ba02541f83c8536c3aa6898e /libavfilter/af_amix.c | |
| parent | 53ddd43f0c9aa9d1060d70a7e921e1ae74601947 (diff) | |
| download | ffmpeg-428b369804d1a0ea7212409e800324ce284e9d55.tar.gz | |
af_amix: only consider negative return codes as errors.
Diffstat (limited to 'libavfilter/af_amix.c')
| -rw-r--r-- | libavfilter/af_amix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 8ceb179e58..a8ec8a194f 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -360,7 +360,7 @@ static int request_samples(AVFilterContext *ctx, int min_samples) s->input_state[i] = INPUT_OFF; continue; } - } else if (ret) + } else if (ret < 0) return ret; } return 0; @@ -422,7 +422,7 @@ static int request_frame(AVFilterLink *outlink) return AVERROR_EOF; else return AVERROR(EAGAIN); - } else if (ret) + } else if (ret < 0) return ret; } av_assert0(s->frame_list->nb_frames > 0); |