diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2025-03-19 21:17:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2025-03-24 13:46:57 +0100 |
| commit | 62c7d08947f5a92d49c74b04f37df7d2c245846c (patch) | |
| tree | 139282ab6f9167f9809b2b6e6be6cd4cbe9bcdb4 | |
| parent | cbbc927a67f142a02bfc5d047c03587599ee5b55 (diff) | |
| download | ffmpeg-62c7d08947f5a92d49c74b04f37df7d2c245846c.tar.gz | |
avcodec/ffv1: Fix remap ordering
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ffv1dec_template.c | 6 | ||||
| -rw-r--r-- | libavcodec/ffv1enc.c | 2 | ||||
| -rw-r--r-- | libavcodec/ffv1enc_template.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c index cdebdf3a62..5ce4f48707 100644 --- a/libavcodec/ffv1dec_template.c +++ b/libavcodec/ffv1dec_template.c @@ -186,9 +186,9 @@ static int RENAME(decode_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc, r += g; } if (sc->remap) { - r = sc->fltmap[0][r & 0xFFFF]; - g = sc->fltmap[1][g & 0xFFFF]; - b = sc->fltmap[2][b & 0xFFFF]; + g = sc->fltmap[0][g & 0xFFFF]; + b = sc->fltmap[1][b & 0xFFFF]; + r = sc->fltmap[2][r & 0xFFFF]; if (transparency) a = sc->fltmap[3][a & 0xFFFF]; } diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index eac4aba49b..82d65d4eee 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -432,7 +432,7 @@ static void set_micro_version(FFV1Context *f) if (f->version == 3) { f->micro_version = 4; } else if (f->version == 4) { - f->micro_version = 5; + f->micro_version = 6; } else av_assert0(0); diff --git a/libavcodec/ffv1enc_template.c b/libavcodec/ffv1enc_template.c index 878ab6c720..29dcedd1b6 100644 --- a/libavcodec/ffv1enc_template.c +++ b/libavcodec/ffv1enc_template.c @@ -152,9 +152,9 @@ static void RENAME(load_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc, r = *((const uint16_t *)(src[2] + x*2 + stride[2]*y)); } - sc->fltmap[0][r] = 1; - sc->fltmap[1][g] = 1; - sc->fltmap[2][b] = 1; + sc->fltmap[0][g] = 1; + sc->fltmap[1][b] = 1; + sc->fltmap[2][r] = 1; if (transparency) sc->fltmap[3][a] = 1; } @@ -214,9 +214,9 @@ static int RENAME(encode_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc, } if (sc->remap) { - r = sc->fltmap[0][r]; - g = sc->fltmap[1][g]; - b = sc->fltmap[2][b]; + g = sc->fltmap[0][g]; + b = sc->fltmap[1][b]; + r = sc->fltmap[2][r]; if (transparency) a = sc->fltmap[3][a]; } |