Browse Source

Merge commit '0456e684394dc5a7b98ab9ebb48396d743bf3730'

* commit '0456e684394dc5a7b98ab9ebb48396d743bf3730':
  audio_fifo: Drop write-only variable

Merged-by: Clément Bœsch <u@pkh.me>
tags/n3.3
Clément Bœsch 8 years ago
parent
commit
2a69724fd5
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavutil/audio_fifo.c

+ 2
- 2
libavutil/audio_fifo.c View File

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


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;


Loading…
Cancel
Save