Merge commit '88626e5af8d006e67189bf10b96b982502a7e8ad'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 11:56:08 +0000 (12:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 12:04:03 +0000 (13:04 +0100)
* commit '88626e5af8d006e67189bf10b96b982502a7e8ad':
  jvdec: check frame dimensions

See: 105654e376a736d243aef4a1d121abebce912e6b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/jvdec.c

Simple merge