Supoort decoding of gray16 images with libopenjpeg.

f0d6828d · Michael Bradshaw · Carl Eugen Hoyos · 6a3cc212 · f0d6828d
Commit f0d6828d authored Jan 30, 2012 by Michael Bradshaw Committed by Carl Eugen Hoyos Jan 30, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

libopenjpegdec.c libavcodec/libopenjpegdec.c +1 -1

No files found.
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -258,7 +258,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
    avcodec_set_dimensions(avctx, width, height);

    switch (image->numcomps) {
-    case 1:  avctx->pix_fmt = PIX_FMT_GRAY8;
+    case 1:  avctx->pix_fmt = (image->comps[0].bpp == 8) ? PIX_FMT_GRAY8 : PIX_FMT_GRAY16;
             break;
    case 3:  avctx->pix_fmt = check_image_attributes(avctx, image);
             break;