Mercurial > libavcodec.hg
comparison mpegvideo.c @ 2658:d1609cfeb1d0 libavcodec
#defines for strict_std_compliance and split between inofficial extensions and non standarized things
author | michael |
---|---|
date | Sun, 08 May 2005 20:15:42 +0000 |
parents | ec2b0cba6764 |
children | b4d7d4d05d95 |
comparison
equal
deleted
inserted
replaced
2657:24472383b36f | 2658:d1609cfeb1d0 |
---|---|
896 av_log(avctx, AV_LOG_ERROR, "only YUV420 is supported\n"); | 896 av_log(avctx, AV_LOG_ERROR, "only YUV420 is supported\n"); |
897 return -1; | 897 return -1; |
898 } | 898 } |
899 | 899 |
900 if(avctx->codec_id == CODEC_ID_MJPEG || avctx->codec_id == CODEC_ID_LJPEG){ | 900 if(avctx->codec_id == CODEC_ID_MJPEG || avctx->codec_id == CODEC_ID_LJPEG){ |
901 if(avctx->strict_std_compliance>=0 && avctx->pix_fmt != PIX_FMT_YUVJ420P){ | 901 if(avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL && avctx->pix_fmt != PIX_FMT_YUVJ420P){ |
902 av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n"); | 902 av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n"); |
903 return -1; | 903 return -1; |
904 } | 904 } |
905 }else{ | 905 }else{ |
906 if(avctx->strict_std_compliance>=0 && avctx->pix_fmt != PIX_FMT_YUV420P){ | 906 if(avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL && avctx->pix_fmt != PIX_FMT_YUV420P){ |
907 av_log(avctx, AV_LOG_ERROR, "colorspace not supported\n"); | 907 av_log(avctx, AV_LOG_ERROR, "colorspace not supported\n"); |
908 return -1; | 908 return -1; |
909 } | 909 } |
910 } | 910 } |
911 | 911 |