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)
commit273f600b037ccf166e5540bc6e8e13d3bf738aa9
tree6ed8d72a329cfb6eebec70d3d748f8acb2b3720d
parentac3ca3d311bb09482049fe5e48ba905f3263a728
parentb564784a207b1395d2b5a41e580539df04651096
Merge commit 'b564784a207b1395d2b5a41e580539df04651096'

* 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>