diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-11-01 00:44:11 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-11-27 16:49:18 -0500 |
| commit | 7f534d11ed37dd03cbaa73eefbfa75696ff04f58 (patch) | |
| tree | 2c9e6e76122fe33798fe31ad03161f6a8a2d1e4b /libavresample/utils.c | |
| parent | 28e1cf19aa3c2467ec02c670af05af2610deef8c (diff) | |
| download | ffmpeg-7f534d11ed37dd03cbaa73eefbfa75696ff04f58.tar.gz | |
lavr: do not pass sample count as a parameter to ff_audio_convert()
It will always be the number of samples in the input buffer, so just use that
directly instead of passing it as a separate parameter.
Diffstat (limited to 'libavresample/utils.c')
| -rw-r--r-- | libavresample/utils.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavresample/utils.c b/libavresample/utils.c index 2d15e37c4b..20b5fb1eea 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 { @@ -381,8 +381,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 +394,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; |