diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2009-02-12 00:48:30 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2009-02-12 00:48:30 +0000 |
commit | 8c7f82068684794876367ca8ff06d02427921922 (patch) | |
tree | dd7483819fddf5647d168105f1d6b0f5ab28e02f /libavcodec/mpegvideo_enc.c | |
parent | 39e80e6cb9668be5a1f95cfcf46bf2bcccc9714b (diff) | |
download | ffmpeg-8c7f82068684794876367ca8ff06d02427921922.tar.gz |
Let rgb32 pass for ljpeg.
Originally committed as revision 17167 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 9f943301a8..3176c2f076 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -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; |