From e19496fe71ae3d588f525c1d385586ea58b4d7dd Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Wed, 19 Mar 2025 22:06:13 +0100
Subject: [PATCH] avcodec/ffv1enc: remap allows using rice golomb with more
 bits

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

diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 0cd76d9c2d..44464d90b5 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -972,7 +972,7 @@ static av_cold int encode_init_internal(AVCodecContext *avctx)
     if (ret < 0)
         return ret;
 
-    if (s->bits_per_raw_sample > (s->version > 3 ? 16 : 8)) {
+    if (s->bits_per_raw_sample > (s->version > 3 ? 16 : 8) && !s->remap_mode) {
         if (s->ac == AC_GOLOMB_RICE) {
             av_log(avctx, AV_LOG_INFO,
                     "high bits_per_raw_sample, forcing range coder\n");