From f0d6828dbe308b277525d3df19c0014833be2271 Mon Sep 17 00:00:00 2001
From: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Date: Mon, 30 Jan 2012 23:53:25 +0100
Subject: [PATCH] Supoort decoding of gray16 images with libopenjpeg.

---
 libavcodec/libopenjpegdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index 07cca2547b..3139b85cf2 100644
--- 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;