diff options
| author | Michael Niedermayer <[email protected]> | 2012-11-28 13:27:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2012-11-28 13:27:18 +0100 |
| commit | 264441715b132344e15f27f6a5740645d5146f56 (patch) | |
| tree | 9ad81892cf141d8a2e3b09c242498aa425daedcf /libavresample/resample.c | |
| parent | b0d9b011c752f8526b73ffcef727c21f34cc5e46 (diff) | |
| parent | f5fa03660db16f9d78abc5a626438b4d0b54f563 (diff) | |
Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'
* commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563':
vble: Do not abort decoding when version is not 1
lavr: do not pass consumed samples as a parameter to ff_audio_resample()
lavr: correct the documentation for the ff_audio_resample() return value
lavr: do not pass sample count as a parameter to ff_audio_convert()
x86: h264_weight: port to cpuflags
configure: Enable avconv filter dependencies automatically
Conflicts:
configure
libavcodec/x86/h264_weight.asm
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavresample/resample.c')
| -rw-r--r-- | libavresample/resample.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavresample/resample.c b/libavresample/resample.c index f0af1ffd58..381d673717 100644 --- a/libavresample/resample.c +++ b/libavresample/resample.c @@ -394,10 +394,9 @@ static int resample(ResampleContext *c, void *dst, const void *src, return dst_index; } -int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src, - int *consumed) +int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src) { - int ch, in_samples, in_leftover, out_samples = 0; + int ch, in_samples, in_leftover, consumed = 0, out_samples = 0; int ret = AVERROR(EINVAL); in_samples = src ? src->nb_samples : 0; @@ -430,7 +429,7 @@ int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src, /* resample each channel plane */ for (ch = 0; ch < c->buffer->channels; ch++) { out_samples = resample(c, (void *)dst->data[ch], - (const void *)c->buffer->data[ch], consumed, + (const void *)c->buffer->data[ch], &consumed, c->buffer->nb_samples, dst->allocated_samples, ch + 1 == c->buffer->channels); } @@ -440,7 +439,7 @@ int ff_audio_resample(ResampleContext *c, AudioData *dst, AudioData *src, } /* drain consumed samples from the internal buffer */ - ff_audio_data_drain(c->buffer, *consumed); + ff_audio_data_drain(c->buffer, consumed); av_dlog(c->avr, "resampled %d in + %d leftover to %d out + %d leftover\n", in_samples, in_leftover, out_samples, c->buffer->nb_samples); |