[FFmpeg-cvslog] Merge commit '88626e5af8d006e67189bf10b96b982502a7e8ad'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 12:56:08 2014 +0100| [f346e37aa27475b4d2153f3606c7d47847854de3] | committer: Michael Niedermayer

Merge commit '88626e5af8d006e67189bf10b96b982502a7e8ad'

* commit '88626e5af8d006e67189bf10b96b982502a7e8ad':
  jvdec: check frame dimensions

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

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