diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-01-05 04:52:35 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-05 04:52:35 +0000 |
| commit | db61329607c858f95cd7e4c165897dcd39f82977 (patch) | |
| tree | 65d7d1360c0ff2025b8bc19cc130eb0b3da619f0 /libavcodec/mpegvideo_enc.c | |
| parent | b26847b710b2fefe7d2d5d1f5c3450105e70b6e9 (diff) | |
| download | ffmpeg-db61329607c858f95cd7e4c165897dcd39f82977.tar.gz | |
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
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 a09538b6c6..f56fabe971 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; |