[FFmpeg-cvslog] ffv1: allow enabling of version 2 by using some of its features.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  8 16:46:36 2012 +0200| [8dfbc1c5cf7973f9ffb5c9857db5d4c03a896686] | committer: Michael Niedermayer

ffv1: allow enabling of version 2 by using some of its features.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8dfbc1c5cf7973f9ffb5c9857db5d4c03a896686
---

 libavcodec/ffv1.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index ca58d09..4c8ef4b 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -873,6 +873,15 @@ static av_cold int encode_init(AVCodecContext *avctx)
     common_init(avctx);
 
     s->version=0;
+
+    if((avctx->flags & (CODEC_FLAG_PASS1|CODEC_FLAG_PASS2)) || avctx->slices>1)
+        s->version = FFMAX(s->version, 2);
+
+    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;
+    }
+
     s->ac= avctx->coder_type ? 2:0;
 
     if(s->ac>1)