Merge commit 'd3cb302b88503c3111e25add196622110c056188'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 11:20:57 +0000 (13:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 11:28:35 +0000 (13:28 +0200)
commit2e85737b0e0bdc9c4d1e28dd9417370f35f8c62d
treec15cba1a649aa81f059bf5092b40a4d6ed7c2f39
parent838bd731393a29a41a86ff15ccf972f967306319
parentd3cb302b88503c3111e25add196622110c056188
Merge commit 'd3cb302b88503c3111e25add196622110c056188'

* commit 'd3cb302b88503c3111e25add196622110c056188':
  jpeg2000: Validate SOT parsing

Conflicts:
libavcodec/jpeg2000dec.c

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