Merge commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:49:28 +0000 (14:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:50:51 +0000 (14:50 +0200)
commitac3ca3d311bb09482049fe5e48ba905f3263a728
tree6ed8d72a329cfb6eebec70d3d748f8acb2b3720d
parent9dfa5ea5dcc8171e4465fd90df56b5c199dbae49
parentef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f
Merge commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f'

* commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f':
  jpeg2000: Propagate error code from get_cox()
  jpeg2000: Check that nreslevels2decode has been initialized before use

Conflicts:
libavcodec/jpeg2000dec.c

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