Merge commit '8f238dd9bdd9eba569fcaa564a07fbdd89412a14' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 12:00:22 +0000 (13:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 12:00:40 +0000 (13:00 +0100)
* commit '8f238dd9bdd9eba569fcaa564a07fbdd89412a14':
  jvdec: check frame dimensions

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

Simple merge