* commit '74f6df74':
  jpeg2000: fix dereferencing invalid pointers during cleanup

Conflicts:
	libavcodec/jpeg2000.c

See: 09927f3e
See: 912ce9dd
See: 9e477a37Merged-by: Michael Niedermayer <michaelni@gmx.at>