[FFmpeg-cvslog] Merge commit '8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 01:23:06 2015 +0100| [f2a84d04331d8179a3cac1adcdef9de1b5c3f1e9] | committer: Michael Niedermayer

Merge commit '8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e' into release/2.4

* commit '8aee35acb1b40e51a4fc8d7f7c561088e25d6d2e':
  rv10: check size of s->mb_width * s->mb_height

Conflicts:
	libavcodec/rv10enc.c

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

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