diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-23 10:24:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-23 10:24:49 +0200 |
| commit | 5056cff12597d57fe9a6bd327aee63de8b1f7ce3 (patch) | |
| tree | 9a6134f7f5b95c7cfa16d07d936510e4e7a5bd68 | |
| parent | 7c49c8b0ac30ef90964dbd0b2a8acd8f2d40f4a3 (diff) | |
| parent | 10f1a4d9bd8239ac64f364e0d3b6423c28230d6d (diff) | |
| download | ffmpeg-5056cff12597d57fe9a6bd327aee63de8b1f7ce3.tar.gz | |
Merge commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d'
* commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d':
jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index c43d9984ed..a7b0a7bbd0 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -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 |