[FFmpeg-cvslog] Merge commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 01:44:44 2015 +0200| [10531d48a0f91aea57eac7e1c6cf5857e601826e] | committer: Michael Niedermayer

Merge commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8'

* commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8':
  eatgv: Check memory allocation

Conflicts:
	libavcodec/eatgv.c

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

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