Merge commit '954aafaa961c32c655ad38fb622e8cbe249ebd5a' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 21:20:49 +0000 (22:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 21:21:47 +0000 (22:21 +0100)
commit17f094697db962e2b4b0aba62f31052c54dfb305
treeb5d60009f7131a0b3efe9f656800886e7568a611
parent522c7c37d23538183d94e960dcb9160441726124
parent954aafaa961c32c655ad38fb622e8cbe249ebd5a
Merge commit '954aafaa961c32c655ad38fb622e8cbe249ebd5a' into release/0.10

* commit '954aafaa961c32c655ad38fb622e8cbe249ebd5a':
  jvdec: check frame dimensions

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