[FFmpeg-cvslog] Merge commit '4736d003fac30af4afd8390182f12f480ad78801'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 15:51:17 2014 +0100| [a4f8a5649561906ccad7f15247f033e7b8df4a4e] | committer: Michael Niedermayer

Merge commit '4736d003fac30af4afd8390182f12f480ad78801'

* commit '4736d003fac30af4afd8390182f12f480ad78801':
  cavsdec: check ff_get_buffer() return value

Conflicts:
	libavcodec/cavsdec.c

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

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