[SCM] libav/experimental: Remove PIX_FMT_RGB32 mjpeg encoding, there is no such thing ...

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:21:22 UTC 2013


The following commit has been merged in the experimental branch:
commit dc8465a9b4b8db3e6c94265a80e4a8e23a2ed3bd
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Jan 5 04:52:21 2011 +0000

    Remove PIX_FMT_RGB32 mjpeg encoding, there is no such thing ...
    
    Originally committed as revision 26218 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 440588b..a09538b 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -259,7 +259,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
         }
         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;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list