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)
* 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>
1  2 
libavcodec/jpeg2000.c

Simple merge