[FFmpeg-cvslog] Merge commit '5650e331a733711b809bc27f968500f0f5530126'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  3 11:20:39 2013 +0200| [37a970bbb668956956c632652a4316cceb48955a] | committer: Michael Niedermayer

Merge commit '5650e331a733711b809bc27f968500f0f5530126'

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

Conflicts:
	libavcodec/jpeg2000dec.c

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

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