[FFmpeg-cvslog] Merge commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 21 00:04:19 2013 +0100| [0c16f6449bb559eca2982c96e79eb7cee7abbfd8] | committer: Michael Niedermayer

Merge commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2'

* commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2':
  jvdec: Do not feed the decoder with known wrong data

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c16f6449bb559eca2982c96e79eb7cee7abbfd8
---