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)
commitb96dddd3440374682b72a00bb6041563f0a8cc86
tree8ce17fdf36f39c6aabb006a50156e82f6e8f73d4
parent6baf9c4406bcdf1015c9ec8bd6b8c4aef77624ac
parent211ca69b13eb0a127a9ef7e70ddaccdab125d1c5
Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

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

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