diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-01-05 04:52:21 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-05 04:52:21 +0000 |
| commit | dc8465a9b4b8db3e6c94265a80e4a8e23a2ed3bd (patch) | |
| tree | fca641b439c1a633c438a79cd22c51ea9147c3c8 /libavcodec/mpegvideo_enc.c | |
| parent | 69057b70f78c09103a61a1027da0bf88c47ca224 (diff) | |
Remove PIX_FMT_RGB32 mjpeg encoding, there is no such thing ...
Originally committed as revision 26218 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 440588b3f2..a09538b6c6 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; |