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

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 22:20:49 2015 +0100| [17f094697db962e2b4b0aba62f31052c54dfb305] | committer: Michael Niedermayer

Merge commit '954aafaa961c32c655ad38fb622e8cbe249ebd5a' into release/0.10

* commit '954aafaa961c32c655ad38fb622e8cbe249ebd5a':
  jvdec: check frame dimensions

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

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