Fix colours for QT JPEG2000, fixes issue 1540.

Originally committed as revision 20963 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/libopenjpeg.c b/libavcodec/libopenjpeg.c
index f1e0474..387ea8b 100644 (file)
--- a/libavcodec/libopenjpeg.c
+++ b/libavcodec/libopenjpeg.c
@@ -131,7 +131,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
                  }
                  break;
         case 4:  has_alpha = 1;
-                 avctx->pix_fmt = PIX_FMT_RGB32;
+                 avctx->pix_fmt = PIX_FMT_RGBA;
                  break;
         default: av_log(avctx, AV_LOG_ERROR, "%d components unsupported.\n", image->numcomps);
                  goto done;