diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-08 16:39:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 13:24:37 +0100 |
| commit | 9e7b477c8c751380e7f5d766f27db7d78be917ef (patch) | |
| tree | 5e83d7a4fcc9db93de895d14d25af9c22cae1abf | |
| parent | dcc9009e141c312537d64bf771d89fbee576806c (diff) | |
| download | ffmpeg-9e7b477c8c751380e7f5d766f27db7d78be917ef.tar.gz | |
avcodec/ffv1enc: choose 1.2 by default for higher resolutions to ensure multi-threaded decodability
Reviewed-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ffv1enc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 7f9f203447..ef07eb9782 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -674,6 +674,10 @@ 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); + // Unspecified level & slices, we choose version 1.2+ to ensure multithreaded decodability + if (avctx->slices == 0 && avctx->level < 0 && avctx->width * avctx->height > 720*576) + s->version = FFMAX(s->version, 2); + if (avctx->level <= 0 && s->version == 2) { s->version = 3; } |