highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix decoding of multithread-encoded lcl files on big-endian.

Browse Source 
Originally committed as revision 19045 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-05-31 10:14:27 +00:00
parent ce22c7d075
commit 661cb0d4a9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/lcldec.c
View File

@ -189,9 +189,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
switch (c->compression) { switch (c->compression) {
case COMP_MSZH: case COMP_MSZH:
if (c->flags & FLAG_MULTITHREAD) { if (c->flags & FLAG_MULTITHREAD) {
mthread_inlen = *(unsigned int*)encoded; mthread_inlen = AV_RL32(encoded);
mthread_inlen = FFMIN(mthread_inlen, len - 8); mthread_inlen = FFMIN(mthread_inlen, len - 8);
mthread_outlen = *(unsigned int*)(encoded+4); mthread_outlen = AV_RL32(encoded+4);
mthread_outlen = FFMIN(mthread_outlen, c->decomp_size); mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size); mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size);
if (mthread_outlen != mszh_dlen) { if (mthread_outlen != mszh_dlen) {
@ -236,9 +236,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
break; break;
if (c->flags & FLAG_MULTITHREAD) { if (c->flags & FLAG_MULTITHREAD) {
int ret; int ret;
mthread_inlen = *(unsigned int*)encoded; mthread_inlen = AV_RL32(encoded);
mthread_inlen = FFMIN(mthread_inlen, len - 8); mthread_inlen = FFMIN(mthread_inlen, len - 8);
mthread_outlen = *(unsigned int*)(encoded+4); mthread_outlen = AV_RL32(encoded+4);
mthread_outlen = FFMIN(mthread_outlen, c->decomp_size); mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
ret = zlib_decomp(avctx, encoded + 8, mthread_inlen, 0, mthread_outlen); ret = zlib_decomp(avctx, encoded + 8, mthread_inlen, 0, mthread_outlen);
if (ret < 0) return ret; if (ret < 0) return ret;