[SCM] libav/experimental: Our ljpeg encoder supports bgra, use the correct constant in the sanity check.

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 db61329607c858f95cd7e4c165897dcd39f82977
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Jan 5 04:52:35 2011 +0000

    Our ljpeg encoder supports bgra, use the correct constant in the sanity check.
    
    Originally committed as revision 26220 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index a09538b..f56fabe 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -252,7 +252,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
         }
         break;
     case CODEC_ID_LJPEG:
-        if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUVJ422P && avctx->pix_fmt != PIX_FMT_YUVJ444P && avctx->pix_fmt != PIX_FMT_RGB32 &&
+        if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUVJ422P && avctx->pix_fmt != PIX_FMT_YUVJ444P && avctx->pix_fmt != PIX_FMT_BGRA &&
            ((avctx->pix_fmt != PIX_FMT_YUV420P && avctx->pix_fmt != PIX_FMT_YUV422P && avctx->pix_fmt != PIX_FMT_YUV444P) || avctx->strict_std_compliance>FF_COMPLIANCE_UNOFFICIAL)){
             av_log(avctx, AV_LOG_ERROR, "colorspace not supported in LJPEG\n");
             return -1;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list