Commit ec0d02e4 authored by Michael Bradshaw's avatar Michael Bradshaw Committed by Carl Eugen Hoyos

Support decoding gray8a with libopenjpeg.

parent 9fdae056
......@@ -260,6 +260,8 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
switch (image->numcomps) {
case 1: avctx->pix_fmt = (image->comps[0].bpp == 8) ? PIX_FMT_GRAY8 : PIX_FMT_GRAY16;
break;
case 2: avctx->pix_fmt = PIX_FMT_GRAY8A;
break;
case 3: avctx->pix_fmt = check_image_attributes(avctx, image);
break;
case 4: avctx->pix_fmt = is_yuva420(image) ? PIX_FMT_YUVA420P : PIX_FMT_RGBA;
......@@ -303,7 +305,11 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
}
break;
case 2:
libopenjpeg_copyto16(picture, image);
if (ispacked) {
libopenjpeg_copy_to_packed8(picture, image);
} else {
libopenjpeg_copyto16(picture, image);
}
break;
case 3:
case 4:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment