From 8bf16e677f5df5c71e92dcfd1cc5b2e2df15410b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 5 Dec 2012 01:20:44 +0100 Subject: [PATCH] ffv1enc: allow encoding with 1 slice for CIF and smaller in version 3 the default is still 4 slices for any resolution, this just allows the user to force 1 slice. This in my quick test improves compression by 1% for a 320x240 sample Signed-off-by: Michael Niedermayer --- libavcodec/ffv1enc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index b3879fc83c..031db061fe 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -872,7 +872,8 @@ static av_cold int encode_init(AVCodecContext *avctx) } if (s->version > 1) { - for (s->num_v_slices = 2; s->num_v_slices < 9; s->num_v_slices++) { + s->num_v_slices = (avctx->width > 352 || avctx->height > 288 || !avctx->slices) ? 2 : 1; + for (; s->num_v_slices < 9; s->num_v_slices++) { for (s->num_h_slices = s->num_v_slices; s->num_h_slices < 2*s->num_v_slices; s->num_h_slices++) { if (avctx->slices == s->num_h_slices * s->num_v_slices && avctx->slices <= 64 || !avctx->slices) goto slices_ok;