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)
* commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58':
  jpeg2000: Check zero bit-plane validity

Conflicts:
libavcodec/jpeg2000dec.c

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

Simple merge