Merge commit '86a2602e16171ddc10c3ec655c23b16ffa595059'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:46:10 +0000 (14:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 12:46:10 +0000 (14:46 +0200)
* commit '86a2602e16171ddc10c3ec655c23b16ffa595059':
  jpeg2000: Drop unused and writeonly fields
  jpeg2000: Correctly calculate sgnd

Conflicts:
libavcodec/jpeg2000.h
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/jpeg2000dec.c

Simple merge