Merge commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Apr 2013 08:24:46 +0000 (10:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Apr 2013 08:24:49 +0000 (10:24 +0200)
commit5056cff12597d57fe9a6bd327aee63de8b1f7ce3
tree9a6134f7f5b95c7cfa16d07d936510e4e7a5bd68
parent7c49c8b0ac30ef90964dbd0b2a8acd8f2d40f4a3
parent10f1a4d9bd8239ac64f364e0d3b6423c28230d6d
Merge commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d'

* commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d':
  jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12

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