Commit b548f2b9 authored by Michael Niedermayer's avatar Michael Niedermayer

ffv1 and ffvhuff havnt changed since a long time and noone proposed any

changes within 1 month after my warning so they are officially no longer
experimental and we will gurantee decodeability of files encoded with
the currenzt ffv1/ffvhuff in the future

Originally committed as revision 5288 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 611fd605
......@@ -550,12 +550,6 @@ static int encode_init(AVCodecContext *avctx)
FFV1Context *s = avctx->priv_data;
int i;
if(avctx->strict_std_compliance >FF_COMPLIANCE_EXPERIMENTAL){
av_log(avctx, AV_LOG_ERROR, "this codec is under development, files encoded with it may not be decodeable with future versions!!!\n"
"use vstrict=-2 / -strict -2 to use it anyway\n");
return -1;
}
common_init(avctx);
s->version=0;
......
......@@ -541,9 +541,6 @@ static int encode_init(AVCodecContext *avctx)
}
if(s->interlaced != ( s->height > 288 ))
av_log(avctx, AV_LOG_INFO, "using huffyuv 2.2.0 or newer interlacing flag\n");
}else if(avctx->strict_std_compliance>FF_COMPLIANCE_EXPERIMENTAL){
av_log(avctx, AV_LOG_ERROR, "This codec is under development; files encoded with it may not be decodable with future versions!!! Set vstrict=-2 / -strict -2 to use it anyway.\n");
return -1;
}
((uint8_t*)avctx->extradata)[0]= s->predictor;
......
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