Let rgb32 pass for ljpeg.
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Feb 2009 00:48:30 +0000 (00:48 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Feb 2009 00:48:30 +0000 (00:48 +0000)
Originally committed as revision 17167 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/mpegvideo_enc.c

index 9f94330..3176c2f 100644 (file)
@@ -235,7 +235,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
         break;
     case CODEC_ID_LJPEG:
     case CODEC_ID_MJPEG:
-        if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUVJ422P &&
+        if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUVJ422P && avctx->pix_fmt != PIX_FMT_RGB32 &&
            ((avctx->pix_fmt != PIX_FMT_YUV420P && avctx->pix_fmt != PIX_FMT_YUV422P) || avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL)){
             av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n");
             return -1;