diff options
| author | Michael Bradshaw <mbradshaw@sorensonmedia.com> | 2011-11-30 21:44:41 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 22:52:39 +0100 |
| commit | 68874c42e70cdd664f8d36de5e18b8d4360b6e71 (patch) | |
| tree | 128469357373620ea3384598873de90d264bd2b6 | |
| parent | a598f0a5d7fdfc545f15b5cd4ae45421817474ca (diff) | |
| download | ffmpeg-68874c42e70cdd664f8d36de5e18b8d4360b6e71.tar.gz | |
Added RGBA and YUV440 decoding support for libopenjpeg decoder
Reviewed-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3f07ef1dfff036a6b35c1605e6346bad2e17da68)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libopenjpegdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); } |