[FFmpeg-devel] [PATCH] avcodec/ffv1enc: Fix explicitly set -slicecrc 2

[FFmpeg-devel] [PATCH] avcodec/ffv1enc: Fix explicitly set -slicecrc 2

[Andreas Rheinhardt]

[-- Attachment #1: Type: text/plain, Size: 27 bytes --]

Patch attached.

- Andreas

[-- Attachment #2: 0001-avcodec-ffv1enc-Fix-explicitly-set-slicecrc-2.patch --]
[-- Type: text/x-patch, Size: 1514 bytes --]

From 29bf954db8fd362f35bd9fd779219e8a2d9c8032 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Sun, 25 May 2025 05:21:44 +0200
Subject: [PATCH] avcodec/ffv1enc: Fix explicitly set -slicecrc 2

crcref needs to be set properly iff ec is two, regardless
of whether it has been explicitly set by the user or set
by default based on level/version.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/ffv1enc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 40209f9935..463f46e091 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -629,7 +629,6 @@ av_cold int ff_ffv1_encode_init(AVCodecContext *avctx)
     if (s->ec < 0) {
         if (s->version >= 4) {
             s->ec = 2;
-            s->crcref = 0x7a8c4079;
         } else if (s->version >= 3) {
             s->ec = 1;
         } else
@@ -639,8 +638,10 @@ av_cold int ff_ffv1_encode_init(AVCodecContext *avctx)
     // CRC requires version 3+
     if (s->ec == 1)
         s->version = FFMAX(s->version, 3);
-    if (s->ec == 2)
+    if (s->ec == 2) {
         s->version = FFMAX(s->version, 4);
+        s->crcref = 0x7a8c4079;
+    }
 
     if ((s->version == 2 || s->version>3) && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
         av_log(avctx, AV_LOG_ERROR, "Version 2 or 4 needed for requested features but version 2 or 4 is experimental and not enabled\n");
-- 
2.45.2


[-- Attachment #3: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/ffv1enc: Fix explicitly set -slicecrc 2

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1015 bytes --]

Hi Andreas

On Sun, May 25, 2025 at 05:46:50AM +0200, Andreas Rheinhardt wrote:
> Patch attached.
> 
> - Andreas

>  ffv1enc.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> eb1d6b708766f131b006f572ef9119184025c3fa  0001-avcodec-ffv1enc-Fix-explicitly-set-slicecrc-2.patch
> From 29bf954db8fd362f35bd9fd779219e8a2d9c8032 Mon Sep 17 00:00:00 2001
> From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> Date: Sun, 25 May 2025 05:21:44 +0200
> Subject: [PATCH] avcodec/ffv1enc: Fix explicitly set -slicecrc 2
> 
> crcref needs to be set properly iff ec is two, regardless
> of whether it has been explicitly set by the user or set
> by default based on level/version.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---

LGTM

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I know you won't believe me, but the highest form of Human Excellence is
to question oneself and others. -- Socrates

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".