Merge commit '50cb695bf124b0bd4d9e2b3c1bfdd08b35b14438' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:28:12 +0000 (04:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:28:28 +0000 (04:28 +0100)
* commit '50cb695bf124b0bd4d9e2b3c1bfdd08b35b14438':
  jvdec: check frame dimensions

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

Simple merge