diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 16:01:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 16:08:27 +0100 |
| commit | 7e343798976991f4320c1c90b8d4fac4c2f9e355 (patch) | |
| tree | 4ffd20dd9efa6411a71f46c4eec21819af6ee3dc /libavresample/utils.c | |
| parent | ce795ac0f53e4c2e50667ac1bef38b82e945e96d (diff) | |
| parent | 0e8ae6d10c609bb968c141aa2436413a55852590 (diff) | |
| download | ffmpeg-7e343798976991f4320c1c90b8d4fac4c2f9e355.tar.gz | |
Merge commit '0e8ae6d10c609bb968c141aa2436413a55852590' into release/1.1
* commit '0e8ae6d10c609bb968c141aa2436413a55852590':
mpegvideo: Drop a faulty assert
lavr: check that current_buffer is not NULL before using it
pmpdec: check that there is at least one audio packet.
lzw: switch to bytestream2
gifdec: convert to bytestream2
Conflicts:
libavcodec/gifdec.c
libavcodec/lzw.c
libavcodec/lzw.h
libavformat/pmpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/utils.c')
| -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 8f6583d6e8..7878cd2374 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -350,7 +350,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); |