From 1b3dbe3f75a64fce040e863e52b80c3888b30ff1 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Fri, 2 Nov 2012 21:33:52 +0000
Subject: [PATCH] lcldec: fix decoding of uncompressed rgb24 sample
Sample from ticket #1216 does not use any compression but bitstream
claims it is. Reference decoder decodes sample just fine.
Fixes #1216.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
libavcodec/lcldec.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index b3b7b523f67..66db7c7f1cd 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -198,7 +198,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
case AV_CODEC_ID_MSZH:
switch (c->compression) {
case COMP_MSZH:
- if (c->flags & FLAG_MULTITHREAD) {
+ if (c->imgtype == IMGTYPE_RGB24 && len == width * height * 3) {
+ ;
+ } else if (c->flags & FLAG_MULTITHREAD) {
mthread_inlen = AV_RL32(encoded);
mthread_inlen = FFMIN(mthread_inlen, len - 8);
mthread_outlen = AV_RL32(encoded+4);
--
GitLab