[FFmpeg-cvslog] Merge commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 04:10:17 2014 +0100| [16f0618200a31e4c017ae88bf09c1e5af6c583e6] | committer: Michael Niedermayer

Merge commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a'

* commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a':
  elbg: check memory allocations and propagate errors

Conflicts:
	libavcodec/elbg.c
	libavcodec/elbg.h

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

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