* commit 'daeb4e30':
  jpeg2000: Proper cleanup on failure in decode_frame()

Conflicts:
	libavcodec/jpeg2000.c

See: 9d56ccf5Merged-by: Michael Niedermayer <michaelni@gmx.at>