Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 65d3359f)

Conflicts:

	libavcodec/jpeg2000dec.c