Commit 2a69724f authored by Clément Bœsch's avatar Clément Bœsch

Merge commit '0456e684'

* commit '0456e684':
  audio_fifo: Drop write-only variable
Merged-by: 's avatarClément Bœsch <u@pkh.me>
parents 4c840c24 0456e684
...@@ -180,7 +180,7 @@ int av_audio_fifo_peek_at(AVAudioFifo *af, void **data, int nb_samples, int offs ...@@ -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 av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples)
{ {
int i, ret, size; int i, size;
if (nb_samples < 0) if (nb_samples < 0)
return AVERROR(EINVAL); return AVERROR(EINVAL);
...@@ -190,7 +190,7 @@ int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples) ...@@ -190,7 +190,7 @@ int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples)
size = nb_samples * af->sample_size; size = nb_samples * af->sample_size;
for (i = 0; i < af->nb_buffers; i++) { 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; return AVERROR_BUG;
} }
af->nb_samples -= nb_samples; af->nb_samples -= nb_samples;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment