diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2024-10-03 01:49:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2024-10-16 21:41:18 +0200 |
| commit | 2542e9296c76524494a2d17a4423d756560b5273 (patch) | |
| tree | 8f7d10170c25062cabef54adf4ed47fef9a6f28b | |
| parent | 31b5b3badc2bc3d9d59d5b534c84033c9eb3d577 (diff) | |
| download | ffmpeg-2542e9296c76524494a2d17a4423d756560b5273.tar.gz | |
avcodec/ffv1: RCT is only possible with RGB
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ffv1dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/ffv1enc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 6aa36716cb..5c099e49ad 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -241,7 +241,7 @@ static int decode_slice_header(const FFV1Context *f, if (f->version > 3) { sc->slice_reset_contexts = get_rac(c, state); sc->slice_coding_mode = get_symbol(c, state, 0); - if (sc->slice_coding_mode != 1) { + if (sc->slice_coding_mode != 1 && f->colorspace == 1) { sc->slice_rct_by_coef = get_symbol(c, state, 0); sc->slice_rct_ry_coef = get_symbol(c, state, 0); if ((uint64_t)sc->slice_rct_by_coef + (uint64_t)sc->slice_rct_ry_coef > 4) { diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index f1228c5252..bd64a46791 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -954,7 +954,7 @@ static void encode_slice_header(FFV1Context *f, FFV1SliceContext *sc) if (sc->slice_coding_mode == 1) ff_ffv1_clear_slice_state(f, sc); put_symbol(c, state, sc->slice_coding_mode, 0); - if (sc->slice_coding_mode != 1) { + if (sc->slice_coding_mode != 1 && f->colorspace == 1) { put_symbol(c, state, sc->slice_rct_by_coef, 0); put_symbol(c, state, sc->slice_rct_ry_coef, 0); } @@ -1070,7 +1070,7 @@ static int encode_slice(AVCodecContext *c, void *arg) p->data[3] ? p->data[3] + ps*x + y*p->linesize[3] : NULL}; sc->slice_coding_mode = 0; - if (f->version > 3) { + if (f->version > 3 && f->colorspace == 1) { choose_rct_params(f, sc, planes, p->linesize, width, height); } else { sc->slice_rct_by_coef = 1; |