virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lcldec: fix decoding of uncompressed rgb24 sample

Browse Source 
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>
This commit is contained in:
Paul B Mahol 2012-11-02 21:33:52 +00:00
parent c4dd4f19f3
commit 1b3dbe3f75
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/lcldec.c
View File

@ -198,7 +198,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
case AV_CODEC_ID_MSZH: case AV_CODEC_ID_MSZH:
switch (c->compression) { switch (c->compression) {
case COMP_MSZH: 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 = AV_RL32(encoded);
mthread_inlen = FFMIN(mthread_inlen, len - 8); mthread_inlen = FFMIN(mthread_inlen, len - 8);
mthread_outlen = AV_RL32(encoded+4); mthread_outlen = AV_RL32(encoded+4);