[FFmpeg-cvslog] Merge commit 'd3cb302b88503c3111e25add196622110c056188'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  3 13:20:57 2013 +0200| [2e85737b0e0bdc9c4d1e28dd9417370f35f8c62d] | committer: Michael Niedermayer

Merge commit 'd3cb302b88503c3111e25add196622110c056188'

* commit 'd3cb302b88503c3111e25add196622110c056188':
  jpeg2000: Validate SOT parsing

Conflicts:
	libavcodec/jpeg2000dec.c

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

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