[FFmpeg-cvslog] Merge commit '69277069dd225f5ae02f0215e877a06522d834d3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 01:42:13 2015 +0200| [3a8b16f78e8bf35328f9d70506c1205bb258792c] | committer: Michael Niedermayer

Merge commit '69277069dd225f5ae02f0215e877a06522d834d3'

* commit '69277069dd225f5ae02f0215e877a06522d834d3':
  dct: Check memory allocation

Conflicts:
	libavcodec/dct.c

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

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