Mercurial > libavcodec.hg

changeset 8807:fa99e152760b libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Let rgb32 pass for ljpeg.
author michael
date Thu, 12 Feb 2009 00:48:30 +0000
parents cbeaa8c0fe4f
children 36f2dabd58c9
files mpegvideo_enc.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mpegvideo_enc.c	Wed Feb 11 22:57:10 2009 +0000
+++ b/mpegvideo_enc.c	Thu Feb 12 00:48:30 2009 +0000
@@ -235,7 +235,7 @@
         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;