[FFmpeg-cvslog] Merge commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  3 14:30:17 2013 +0200| [2cad1ea29e4df69a556a95e942968184493fb249] | committer: Michael Niedermayer

Merge commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58'

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

Conflicts:
	libavcodec/jpeg2000dec.c

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

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