From 324954cf960eb098929f4c610f60f5e1547609f6 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Mon, 2 Apr 2018 16:03:03 +0200
Subject: [PATCH] avcodec/scpr: fix decoding of prev+top-topleft prediction in
keyframes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
libavcodec/scpr.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c
index 3c797d55f52..72f59d59171 100644
--- a/libavcodec/scpr.c
+++ b/libavcodec/scpr.c
@@ -446,13 +446,13 @@ static int decompress_i(AVCodecContext *avctx, uint32_t *dst, int linesize)
}
r = odst[(ly * linesize + lx) * 4] +
- odst[((y * linesize + x) + off - z) * 4 + 4] -
+ odst[((y * linesize + x) + off) * 4 + 4] -
odst[((y * linesize + x) + off - z) * 4];
g = odst[(ly * linesize + lx) * 4 + 1] +
- odst[((y * linesize + x) + off - z) * 4 + 5] -
+ odst[((y * linesize + x) + off) * 4 + 5] -
odst[((y * linesize + x) + off - z) * 4 + 1];
b = odst[(ly * linesize + lx) * 4 + 2] +
- odst[((y * linesize + x) + off - z) * 4 + 6] -
+ odst[((y * linesize + x) + off) * 4 + 6] -
odst[((y * linesize + x) + off - z) * 4 + 2];
clr = ((b & 0xFF) << 16) + ((g & 0xFF) << 8) + (r & 0xFF);
dst[y * linesize + x] = clr;
--
GitLab