[FFmpeg-cvslog] Merge commit '772f50c1f3e4a50ce3f35e31a6f0cd64e7cbe818' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 13:04:23 2015 +0100| [1d9a93682da052d2e87555fab368e8d79f3b8de2] | committer: Michael Niedermayer

Merge commit '772f50c1f3e4a50ce3f35e31a6f0cd64e7cbe818' into release/2.2

* commit '772f50c1f3e4a50ce3f35e31a6f0cd64e7cbe818':
  rv10: check size of s->mb_width * s->mb_height

Conflicts:
	libavcodec/rv10enc.c

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

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