Merge commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 23:04:19 +0000 (00:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 23:06:13 +0000 (00:06 +0100)
* commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2':
  jvdec: Do not feed the decoder with known wrong data

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

Simple merge