[FFmpeg-cvslog] Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 09:59:49 2013 +0100| [b96dddd3440374682b72a00bb6041563f0a8cc86] | committer: Michael Niedermayer

Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b96dddd3440374682b72a00bb6041563f0a8cc86
---