Merge commit '582d4211e00015b68626f77ce4af53161e2b1713'

[ffmpeg] / libavcodec / ffv1enc.c

diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index dae68aee636d093cbee6e40c3c00852fb3921b8c..68d311d1b87944ac53f2ab8d9cd73af93f9b0396 100644 (file)
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -629,6 +629,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
         s->chroma_planes = 1;
         s->bits_per_raw_sample = 16;
         s->use32bit = 1;
+        s->version = FFMAX(s->version, 1);
         if (avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
             av_log(avctx, AV_LOG_ERROR, "16bit RGB is experimental and under development, only use it for experiments\n");
             return AVERROR_INVALIDDATA;