| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 08:59:49 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 08:59:53 (GMT) |
| commit | b96dddd3440374682b72a00bb6041563f0a8cc86 (patch) | |
| tree | 8ce17fdf36f39c6aabb006a50156e82f6e8f73d4 | |
| parent | 6baf9c4406bcdf1015c9ec8bd6b8c4aef77624ac (diff) | |
| parent | 211ca69b13eb0a127a9ef7e70ddaccdab125d1c5 (diff) | |
| download | ffmpeg-b96dddd3440374682b72a00bb6041563f0a8cc86.zip ffmpeg-b96dddd3440374682b72a00bb6041563f0a8cc86.tar.gz ffmpeg-b96dddd3440374682b72a00bb6041563f0a8cc86.tar.bz2 | |
Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'
* commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5':
lavr: check that current_buffer is not NULL before using it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavresample/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavresample/utils.c b/libavresample/utils.c index 35e7ef6..db1e087 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -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); |