[FFmpeg-cvslog] Merge commit 'fc159ba88ea2dd1fa11e4ab6af8b574fc80db454' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 22:31:40 2015 +0100| [8439378f41e34737499858eff8bafb930aee50ca] | committer: Michael Niedermayer

Merge commit 'fc159ba88ea2dd1fa11e4ab6af8b574fc80db454' into release/0.10

* commit 'fc159ba88ea2dd1fa11e4ab6af8b574fc80db454':
  mmvideo: check frame dimensions

Conflicts:
	libavcodec/mmvideo.c

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

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