[FFmpeg-cvslog] Merge commit 'e1ea365f7e1477c78865b866a180712174536c20'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 02:41:45 2015 +0200| [07f606b4f0149b6515248b9f7b879a59b2008d7e] | committer: Michael Niedermayer

Merge commit 'e1ea365f7e1477c78865b866a180712174536c20'

* commit 'e1ea365f7e1477c78865b866a180712174536c20':
  truemotion2: Check memory allocation

Conflicts:
	libavcodec/truemotion2.c

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

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