diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-24 13:17:55 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-24 13:17:55 +0100 |
| commit | 2a69724fd5e0d380d201a955269622239288e6d5 (patch) | |
| tree | 92e5ded1b20009b23ea5086988c41069da3291e5 /libavutil/audio_fifo.c | |
| parent | 4c840c249dffe3f77443dca2b39c4c70eddd6550 (diff) | |
| parent | 0456e684394dc5a7b98ab9ebb48396d743bf3730 (diff) | |
| download | ffmpeg-2a69724fd5e0d380d201a955269622239288e6d5.tar.gz | |
Merge commit '0456e684394dc5a7b98ab9ebb48396d743bf3730'
* commit '0456e684394dc5a7b98ab9ebb48396d743bf3730':
audio_fifo: Drop write-only variable
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavutil/audio_fifo.c')
| -rw-r--r-- | libavutil/audio_fifo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/audio_fifo.c b/libavutil/audio_fifo.c index de187104e6..1bf75ced54 100644 --- a/libavutil/audio_fifo.c +++ b/libavutil/audio_fifo.c @@ -180,7 +180,7 @@ int av_audio_fifo_peek_at(AVAudioFifo *af, void **data, int nb_samples, int offs int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples) { - int i, ret, size; + int i, size; if (nb_samples < 0) return AVERROR(EINVAL); @@ -190,7 +190,7 @@ int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples) size = nb_samples * af->sample_size; for (i = 0; i < af->nb_buffers; i++) { - if ((ret = av_fifo_generic_read(af->buf[i], data[i], size, NULL)) < 0) + if (av_fifo_generic_read(af->buf[i], data[i], size, NULL) < 0) return AVERROR_BUG; } af->nb_samples -= nb_samples; |