virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

Browse Source 
* commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5':
  lavr: check that current_buffer is not NULL before using it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-28 09:59:49 +01:00
commit b96dddd344
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavresample/utils.c
View File

@ -438,7 +438,8 @@ int attribute_align_arg avresample_convert(AVAudioResampleContext *avr,
resample_out = &output_buffer; resample_out = &output_buffer;
else else
resample_out = avr->resample_out_buffer; 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); resample_out->name);
ret = ff_audio_resample(avr->resample, resample_out, ret = ff_audio_resample(avr->resample, resample_out,
current_buffer); current_buffer);