Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 08:59:49 +0000 (09:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 08:59:53 +0000 (09:59 +0100)
* commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5':
  lavr: check that current_buffer is not NULL before using it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavresample/utils.c

Simple merge