videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-09 01:07:01 +02:00
Code Releases Activity

Support decoding gray8a with libopenjpeg.

Browse Source
This commit is contained in:
Michael Bradshaw 2012-02-01 15:47:28 +01:00 committed by Carl Eugen Hoyos
parent 9fdae05607
commit ec0d02e441
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/libopenjpegdec.c
View File

@ -260,6 +260,8 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
switch (image->numcomps) { switch (image->numcomps) {
case 1: avctx->pix_fmt = (image->comps[0].bpp == 8) ? PIX_FMT_GRAY8 : PIX_FMT_GRAY16; case 1: avctx->pix_fmt = (image->comps[0].bpp == 8) ? PIX_FMT_GRAY8 : PIX_FMT_GRAY16;
break; break;
case 2: avctx->pix_fmt = PIX_FMT_GRAY8A;
break;
case 3: avctx->pix_fmt = check_image_attributes(avctx, image); case 3: avctx->pix_fmt = check_image_attributes(avctx, image);
break; break;
case 4: avctx->pix_fmt = is_yuva420(image) ? PIX_FMT_YUVA420P : PIX_FMT_RGBA; 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; break;
case 2: case 2:
libopenjpeg_copyto16(picture, image); if (ispacked) {
libopenjpeg_copy_to_packed8(picture, image);
} else {
libopenjpeg_copyto16(picture, image);
}
break; break;
case 3: case 3:
case 4: case 4: