From: Luca Barbato <[email protected]> Spare a branch and make coverity less confused.
CC: [email protected] Bug-Id: CID 1238806 --- libavresample/utils.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavresample/utils.c b/libavresample/utils.c index fd8d17d..54ce81f 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -338,11 +338,6 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr, int ret, direct_output; /* reset internal buffers */ - if (avr->in_buffer) { - avr->in_buffer->nb_samples = 0; - ff_audio_data_set_channels(avr->in_buffer, - avr->in_buffer->allocated_channels); - } if (avr->out_buffer) { avr->out_buffer->nb_samples = 0; ff_audio_data_set_channels(avr->out_buffer, @@ -394,6 +389,10 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr, return ret; current_buffer = avr->out_buffer; } else if (avr->in_copy_needed || avr->in_convert_needed) { + avr->in_buffer->nb_samples = 0; + ff_audio_data_set_channels(avr->in_buffer, + avr->in_buffer->allocated_channels); + /* if needed, copy or convert input to in_buffer, and downmix if applicable */ if (avr->in_convert_needed) { -- 1.9.3 (Apple Git-50) _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
