Merge commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 09:30:17 +0000 (11:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 09:30:17 +0000 (11:30 +0200)
* commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55':
  bitstream: Check the result of av_malloc()

Conflicts:
libavcodec/bitstream.c

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

Trivial merge