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)
commit9dfa5ea5dcc8171e4465fd90df56b5c199dbae49
treebeb126aed78bdb30654f1bb58a672cc0c7ba95e9
parenta4a16821d7326a6a62c6ac3d9fc8b3d8f111cefc
parent86a2602e16171ddc10c3ec655c23b16ffa595059
Merge commit '86a2602e16171ddc10c3ec655c23b16ffa595059'

* 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>
libavcodec/jpeg2000dec.c