diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 13:27:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 13:27:18 +0100 |
| commit | 264441715b132344e15f27f6a5740645d5146f56 (patch) | |
| tree | 9ad81892cf141d8a2e3b09c242498aa425daedcf /libavresample/utils.c | |
| parent | b0d9b011c752f8526b73ffcef727c21f34cc5e46 (diff) | |
| parent | f5fa03660db16f9d78abc5a626438b4d0b54f563 (diff) | |
| download | ffmpeg-264441715b132344e15f27f6a5740645d5146f56.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavresample/utils.c')
| -rw-r--r-- | libavresample/utils.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libavresample/utils.c b/libavresample/utils.c index ad49e880af..5591f1575e 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -313,8 +313,8 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr, if (ret < 0) return ret; av_dlog(avr, "[convert] %s to in_buffer\n", current_buffer->name); - ret = ff_audio_convert(avr->ac_in, avr->in_buffer, current_buffer, - current_buffer->nb_samples); + ret = ff_audio_convert(avr->ac_in, avr->in_buffer, + current_buffer); if (ret < 0) return ret; } else { @@ -342,7 +342,6 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr, if (avr->resample_needed) { AudioData *resample_out; - int consumed = 0; if (!avr->out_convert_needed && direct_output && out_samples > 0) resample_out = &output_buffer; @@ -351,7 +350,7 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr, av_dlog(avr, "[resample] %s to %s\n", current_buffer->name, resample_out->name); ret = ff_audio_resample(avr->resample, resample_out, - current_buffer, &consumed); + current_buffer); if (ret < 0) return ret; @@ -381,8 +380,7 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr, if (direct_output && out_samples >= current_buffer->nb_samples) { /* convert directly to output */ av_dlog(avr, "[convert] %s to output\n", current_buffer->name); - ret = ff_audio_convert(avr->ac_out, &output_buffer, current_buffer, - current_buffer->nb_samples); + ret = ff_audio_convert(avr->ac_out, &output_buffer, current_buffer); if (ret < 0) return ret; @@ -395,7 +393,7 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr, return ret; av_dlog(avr, "[convert] %s to out_buffer\n", current_buffer->name); ret = ff_audio_convert(avr->ac_out, avr->out_buffer, - current_buffer, current_buffer->nb_samples); + current_buffer); if (ret < 0) return ret; current_buffer = avr->out_buffer; |