* commit '5650e331':
  jpeg2000: Validate resolution levels

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