* commit '86a2602e':
  jpeg2000: Drop unused and writeonly fields
  jpeg2000: Correctly calculate sgnd

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