1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00

Merge commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-23 10:24:46 +02:00
commit 5056cff125

View File

@ -212,7 +212,7 @@ static int get_siz(Jpeg2000DecoderContext *s)
case FF_PROFILE_JPEG2000_DCINEMA_2K:
case FF_PROFILE_JPEG2000_DCINEMA_4K:
/* XYZ color-space for digital cinema profiles */
s->avctx->pix_fmt = AV_PIX_FMT_XYZ12LE;
s->avctx->pix_fmt = AV_PIX_FMT_XYZ12;
break;
default:
/* For other profiles selects color-space according number of