[FFmpeg-cvslog] Merge commit '50cb695bf124b0bd4d9e2b3c1bfdd08b35b14438' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 21 04:28:12 2014 +0100| [6e5dd43bf9099a72de04ccc8a65dd1c4939aed92] | committer: Michael Niedermayer

Merge commit '50cb695bf124b0bd4d9e2b3c1bfdd08b35b14438' into release/1.1

* commit '50cb695bf124b0bd4d9e2b3c1bfdd08b35b14438':
  jvdec: check frame dimensions

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

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