Merge commit '29b00f880faa404aa1d0d6820310c510c5996479'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 10:00:53 +0000 (12:00 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 10:08:39 +0000 (12:08 +0200)
commit64f72bb61f0f341698c75231ff7deaa2be3853b2
treef3ee27c342127f7e1e776d26467b82ee17e4d6ac
parentdc1050a3e8557fc423023036f698cc476fb675b4
parent29b00f880faa404aa1d0d6820310c510c5996479
Merge commit '29b00f880faa404aa1d0d6820310c510c5996479'

* commit '29b00f880faa404aa1d0d6820310c510c5996479':
  jpeg2000: Templatize the frame writer

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