Merge commit '5bf208f659703895df7926238dcfa8a8175de36b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:30:05 +0000 (15:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:30:05 +0000 (15:30 +0200)
commit2328e7e865216acdad6c9ce8a8dae4664aff3a29
treeb36393eb4db949bbda12bbee44e093d2fdbc73ad
parent11cf4b72475f70a35d78b04e3b21d295c2da8a1d
parent5bf208f659703895df7926238dcfa8a8175de36b
Merge commit '5bf208f659703895df7926238dcfa8a8175de36b'

* commit '5bf208f659703895df7926238dcfa8a8175de36b':
  jpeg2000: Use separate fields for int and float codepaths
  jpeg2000: Split int/float codepaths depending on the DWT

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

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