[FFmpeg-cvslog] r26218 - trunk/libavcodec/mpegvideo_enc.c

michael subversion
Wed Jan 5 05:52:22 CET 2011


Author: michael
Date: Wed Jan  5 05:52:21 2011
New Revision: 26218

Log:
Remove PIX_FMT_RGB32 mjpeg encoding, there is no such thing ...

Modified:
   trunk/libavcodec/mpegvideo_enc.c

Modified: trunk/libavcodec/mpegvideo_enc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_enc.c	Wed Jan  5 02:14:14 2011	(r26217)
+++ trunk/libavcodec/mpegvideo_enc.c	Wed Jan  5 05:52:21 2011	(r26218)
@@ -259,7 +259,7 @@ av_cold int MPV_encode_init(AVCodecConte
         }
         break;
     case CODEC_ID_MJPEG:
-        if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUVJ422P && avctx->pix_fmt != PIX_FMT_RGB32 &&
+        if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUVJ422P &&
            ((avctx->pix_fmt != PIX_FMT_YUV420P && avctx->pix_fmt != PIX_FMT_YUV422P) || avctx->strict_std_compliance>FF_COMPLIANCE_UNOFFICIAL)){
             av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n");
             return -1;



More information about the ffmpeg-cvslog mailing list