summaryrefslogtreecommitdiff
authorJustin Ruggles <justin.ruggles@gmail.com>2013-10-27 19:00:36 (GMT)
committer Justin Ruggles <justin.ruggles@gmail.com>2013-10-27 19:07:10 (GMT)
commit211ca69b13eb0a127a9ef7e70ddaccdab125d1c5 (patch)
tree41a5e472c0c1bbc3da84df348f4e60e044c92d65
parent834259528b6cf593bf9544e3183b84b9b7880641 (diff)
downloadffmpeg-211ca69b13eb0a127a9ef7e70ddaccdab125d1c5.zip
ffmpeg-211ca69b13eb0a127a9ef7e70ddaccdab125d1c5.tar.gz
ffmpeg-211ca69b13eb0a127a9ef7e70ddaccdab125d1c5.tar.bz2
lavr: check that current_buffer is not NULL before using it
Fixes a segfault during resampling when compiled with -DDEBUG. Fixes all fate-lavr-resample tests with -DDEBUG. CC:libav-stable@libav.org
Diffstat
-rw-r--r--libavresample/utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavresample/utils.c b/libavresample/utils.c
index b79def9..2dd3d06 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);