[FFmpeg-devel] [PATCHv2 2/4] avcodec/mm: decode partial palette

From: Peter Ross <pross@xvid.org>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCHv2 2/4] avcodec/mm: decode partial palette
Date: Thu, 27 Jun 2024 08:08:33 +1000
Message-ID: <089793aaa66d4fc39083cfe4332e4b294a144db9.1719439673.git.pross@xvid.org> (raw)
In-Reply-To: <5062735ea3804e138da9ebd1d753c6bf4ec334b2.1719439673.git.pross@xvid.org>


[-- Attachment #1.1: Type: text/plain, Size: 960 bytes --]

Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/mmvideo.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index 3038d9ea92..933d895f96 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -78,13 +78,10 @@ static av_cold int mm_decode_init(AVCodecContext *avctx)
 
 static void mm_decode_pal(MmContext *s)
 {
-    int i;
-
-    bytestream2_skip(&s->gb, 4);
-    for (i = 0; i < 128; i++) {
-        s->palette[i] = 0xFFU << 24 | bytestream2_get_be24(&s->gb);
-        s->palette[i+128] = s->palette[i]<<2;
-    }
+    int start = bytestream2_get_le16(&s->gb);
+    int count = bytestream2_get_le16(&s->gb);
+    for (int i = 0; i < count; i++)
+        s->palette[start+i] = 0xFFU << 24 | (bytestream2_get_be24(&s->gb) << 2);
 }
 
 /**
-- 
2.43.0

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
