Merge commit '95a41311ac3a44773cc4dc407408aca35b1f8e26'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 12:01:58 +0000 (14:01 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 12:01:58 +0000 (14:01 +0200)
commit2fc552b629d771c8357a1b0262af4b21e5bcd4b8
tree93a44bae974e270363ceed4c7293b741a677d424
parent054ce2d6ab15a9f3cb9cb1cac9b2f07a6323d8a5
parent95a41311ac3a44773cc4dc407408aca35b1f8e26
Merge commit '95a41311ac3a44773cc4dc407408aca35b1f8e26'

* commit '95a41311ac3a44773cc4dc407408aca35b1f8e26':
  jpeg2000: Factor out band stepsize initialization

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/jpeg2000.c