Commit dc8465a9 authored by Michael Niedermayer's avatar Michael Niedermayer

Remove PIX_FMT_RGB32 mjpeg encoding, there is no such thing ...

Originally committed as revision 26218 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 69057b70
...@@ -259,7 +259,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) ...@@ -259,7 +259,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
} }
break; break;
case CODEC_ID_MJPEG: 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)){ ((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"); av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n");
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment