Merge commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:20:37 +0000 (15:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:20:37 +0000 (15:20 +0200)
commit11cf4b72475f70a35d78b04e3b21d295c2da8a1d
treefaf09b9f98d831beab3df7ee9bdc10279502d0fa
parentc7a092cb2d573535dbc26e93a1664f3db39df47c
parentf9581f1414ec8e3e7d0868793cda4f2e4fa113ea
Merge commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea'

* commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea':
  jpeg2000: Improve reduced resolution decoding
  jpeg2000: Compute quantization for 'scalar derived' in the correct case.
  jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component()

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

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