diff mbox

[FFmpeg-devel] avcodec/ffv1enc: Check that the crc + version combination is supported

Message ID 20180421201931.24467-1-michael@niedermayer.cc
State Accepted
Commit d9706f79c17a33bf97e51a7d6ab211ce83a463ee
Headers show

Commit Message

Michael Niedermayer April 21, 2018, 8:19 p.m. UTC
The crc flag is only stored since version 3 thus before this crcs do not
work. We increase the version as needed same as we do with pix_fmts

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/ffv1enc.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Niedermayer April 23, 2018, 11:22 p.m. UTC | #1
On Sat, Apr 21, 2018 at 10:19:31PM +0200, Michael Niedermayer wrote:
> The crc flag is only stored since version 3 thus before this crcs do not
> work. We increase the version as needed same as we do with pix_fmts
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/ffv1enc.c | 4 ++++
>  1 file changed, 4 insertions(+)

will apply

[...]
diff mbox

Patch

diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index dd4d7429f5..23e8d3dfa4 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -539,6 +539,10 @@  static av_cold int encode_init(AVCodecContext *avctx)
         s->ec = (s->version >= 3);
     }
 
+    // CRC requires version 3+
+    if (s->ec)
+        s->version = FFMAX(s->version, 3);
+
     if ((s->version == 2 || s->version>3) && 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 AVERROR_INVALIDDATA;