OSDN Git Service

Merge remote-tracking branch 'mjbshaw/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Feb 2013 12:22:49 +0000 (13:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Feb 2013 12:22:56 +0000 (13:22 +0100)
commitc67ddb56da551b5afe536cf0bdc6487ccc80b8ce
tree3f013fa98d1cbcdbb94579b2d5e2b33959b09a40
parenta2bff49e26a9c0bc6caa5ba3b7479df7afe00342
parent60f06f986f81c5aa0497c4fa189f50a504896c81
Merge remote-tracking branch 'mjbshaw/master'

* mjbshaw/master:
  libopenjpegenc: make dci compliant j2c

Merged-by: Michael Niedermayer <michaelni@gmx.at>