aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-24 23:05:16 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-24 23:29:09 +0200
commit44f789c092cbd0883a28163d69a22c067f52ce85 (patch)
tree882b88b8437a6b3f9a6812e05a2425aa2ac64fb8
parente37419a8065f20bd00e7955fa57b38d0530daad3 (diff)
downloadffmpeg-44f789c092cbd0883a28163d69a22c067f52ce85.tar.gz
ffv1: allow selecting 1.3 by using -level
Note, 1.3 is not finalized and the bitstream will still change do not use it yet. This option is just to make playing with it easier, otherwise one would have to edit the source Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/ffv1.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 8e79f4712a..b9b36dcf94 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -903,6 +903,11 @@ 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 = 3;
+ s->ec = 1;
+ }
+
if(s->version >= 2 && 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 -1;