[FFmpeg-cvslog] Merge commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  3 14:49:28 2013 +0200| [ac3ca3d311bb09482049fe5e48ba905f3263a728] | committer: Michael Niedermayer

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 at gmx.at>

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