[FFmpeg-cvslog] Merge commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 04:19:58 2014 +0100| [bb7ad47ddf94511eece7e243402e2cf95cddf1df] | committer: Michael Niedermayer

Merge commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4'

* commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4':
  roqvideo: check memory allocations and propagate errors

Conflicts:
	libavcodec/roqvideoenc.c

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

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