OSDN Git Service

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)
commit0c16f6449bb559eca2982c96e79eb7cee7abbfd8
treeebbcd9ffb7e2d730457ea3aeb4ddf593be71d026
parentb9f33ad32077eb0570a9038a9ff93a176ef66dfe
parent15739a9bd19a7d47ad8afb25348c684a3bdd6ef2
Merge commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2'

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

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