[FFmpeg-cvslog] avcodec/mm: decode partial palette

Peter Ross git at videolan.org
Thu Nov 21 11:13:08 EET 2024


ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Sat Jun  8 18:39:10 2024 +1000| [63ea1660fa06d30c3bcbad68373a6caf88ac9c4c] | committer: Peter Ross

avcodec/mm: decode partial palette

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63ea1660fa06d30c3bcbad68373a6caf88ac9c4c
---

 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);
 }
 
 /**



More information about the ffmpeg-cvslog mailing list