Commit b96dddd3 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '211ca69b'

* commit '211ca69b':
  lavr: check that current_buffer is not NULL before using it
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6baf9c44 211ca69b
......@@ -438,7 +438,8 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr,
resample_out = &output_buffer;
else
resample_out = avr->resample_out_buffer;
av_dlog(avr, "[resample] %s to %s\n", current_buffer->name,
av_dlog(avr, "[resample] %s to %s\n",
current_buffer ? current_buffer->name : "null",
resample_out->name);
ret = ff_audio_resample(avr->resample, resample_out,
current_buffer);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment