ffmpeg | branch: release/7.1 | Michael Niedermayer <mich...@niedermayer.cc> | Thu Oct 3 01:49:09 2024 +0200| [7043ef6828548c64b8e75baa1f6d9ce6fa052a72] | committer: Michael Niedermayer
avcodec/ffv1: RCT is only possible with RGB Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit 2542e9296c76524494a2d17a4423d756560b5273) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7043ef6828548c64b8e75baa1f6d9ce6fa052a72 --- libavcodec/ffv1dec.c | 2 +- libavcodec/ffv1enc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 44b2085f78..79374658ec 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 3e8f6ee445..8e436358ed 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -946,7 +946,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); } @@ -1062,7 +1062,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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
