diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-17 04:28:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 17:33:53 +0200 |
| commit | abe76b851c05eea8743f6c899cbe5f7409b0f301 (patch) | |
| tree | aaf90184572aa36569a6190c8bf396b1e6f27f53 /libavcodec/ffv1enc.c | |
| parent | 185fc52f196c241a96272cc6ccd2a37bc765ddff (diff) | |
| download | ffmpeg-abe76b851c05eea8743f6c899cbe5f7409b0f301.tar.gz | |
ffv1enc: Make ffv1.3 non experimental
The fate tests change as they used 1.2 previously
The increased size is due to:
32bit CRCs per slice by default (can be disabled),
it adds slice headers to allow decoding one slice without the others
an additional slice size field is added to make it possible to find
slices within corrupted surroundings.
these add up to about 57bit per slice more
at 50 frames and 4 slices thats 1425 byte
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1enc.c')
| -rw-r--r-- | libavcodec/ffv1enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index faf64ca780..6baa7e97bf 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -651,7 +651,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((avctx->flags & (CODEC_FLAG_PASS1|CODEC_FLAG_PASS2)) || avctx->slices>1) s->version = FFMAX(s->version, 2); - if (avctx->level == 3 || (s->version==2 && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL)) { + if (avctx->level == 3 || (avctx->level <= 0 && s->version == 2)) { s->version = 3; } @@ -659,7 +659,7 @@ static av_cold int encode_init(AVCodecContext *avctx) s->ec = (s->version >= 3); } - if (s->version >= 2 && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { + if ((s->version == 2 || s->version>3) && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { av_log(avctx, AV_LOG_ERROR, "Version 2 needed for requested features but version 2 is experimental and not enabled\n"); return AVERROR_INVALIDDATA; } |