[FFmpeg-cvslog] Merge commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 22 03:51:49 2015 +0100| [a821617b5a09321a4ff875f77ad95daf6942c0d1] | committer: Michael Niedermayer

Merge commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7'

* commit 'd450cb07d91ef39ad1d39bd7ca0cfce4bd7b13e7':
  avplay: Check memory allocation

Conflicts:
	ffplay.c

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

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