From 3f07ef1dfff036a6b35c1605e6346bad2e17da68 Mon Sep 17 00:00:00 2001 From: Michael Bradshaw Date: Wed, 30 Nov 2011 21:44:41 -0700 Subject: [PATCH] Added RGBA and YUV440 decoding support for libopenjpeg decoder Reviewed-by: Jean First Signed-off-by: Michael Niedermayer --- libavcodec/libopenjpegdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 8cab41e124..08e7cd540a 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -52,6 +52,7 @@ static enum PixelFormat check_image_attributes(AVCodecContext *avctx, opj_image_ switch (compRatio) { case 0111111: goto libopenjpeg_yuv444_rgb; + case 0111212: return PIX_FMT_YUV440P; case 0112121: goto libopenjpeg_yuv422; case 0112222: goto libopenjpeg_yuv420; default: goto libopenjpeg_rgb; @@ -296,6 +297,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, libopenjpeg_copyto16(picture, image); break; case 3: + case 4: if (ispacked) { libopenjpeg_copy_to_packed8(picture, image); }