Mercurial > libavcodec.hg

comparison mpegvideo_enc.c @ 12084:b6cf19580e47 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change all occurences of "inofficial" to "unofficial" in code, comments and options. Keep old options until next major version bump. Patch by Rodney Baker, rodney d baker a iinet d net d au
author cehoyos
date Sat, 03 Jul 2010 15:35:23 +0000
parents 7dd2a45249a9
children 04e68eb1aab7
comparison
equal deleted inserted replaced
12083:dd5efc28bca9 12084:b6cf19580e47
252 } 252 }
253 break; 253 break;
254 case CODEC_ID_LJPEG: 254 case CODEC_ID_LJPEG:
255 case CODEC_ID_MJPEG: 255 case CODEC_ID_MJPEG:
256 if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUVJ422P && avctx->pix_fmt != PIX_FMT_RGB32 && 256 if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUVJ422P && avctx->pix_fmt != PIX_FMT_RGB32 &&
257 ((avctx->pix_fmt != PIX_FMT_YUV420P && avctx->pix_fmt != PIX_FMT_YUV422P) || avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL)){ 257 ((avctx->pix_fmt != PIX_FMT_YUV420P && avctx->pix_fmt != PIX_FMT_YUV422P) || avctx->strict_std_compliance>FF_COMPLIANCE_UNOFFICIAL)){
258 av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n"); 258 av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n");
259 return -1; 259 return -1;
260 } 260 }
261 break; 261 break;
262 default: 262 default: