Merge commit 'b564784a207b1395d2b5a41e580539df04651096'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:59:35 +0000 (14:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:59:35 +0000 (14:59 +0200)
* commit 'b564784a207b1395d2b5a41e580539df04651096':
  jpeg2000: Check that there is a SOT before SOD
  jpeg2000: Remove unneeded returns

Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

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

Trivial merge