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)
commitf346e37aa27475b4d2153f3606c7d47847854de3
tree3e9348f06b2c2723c0099567dcc73c8a4ad75a5d
parent6c68522a2aa8c3fc664482ab8a18c991039c78aa
parent88626e5af8d006e67189bf10b96b982502a7e8ad
Merge commit '88626e5af8d006e67189bf10b96b982502a7e8ad'

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

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