* commit 'a2448cfe':
  jpeg2000: do not compute the same value twice

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