Merge commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:30:17 +0000 (14:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:30:17 +0000 (14:30 +0200)
commit2cad1ea29e4df69a556a95e942968184493fb249
tree001ddee58f322d8050c42e66b52ac17c72db8aea
parentdb5c93a1a97d3b6919d70bce65d09dc53be708f8
parent17e5d614a8647d51b9795cb8bccf97ee33ca2d58
Merge commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58'

* commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58':
  jpeg2000: Check zero bit-plane validity

Conflicts:
libavcodec/jpeg2000dec.c

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