generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use FFMIN

Browse Source 
Originally committed as revision 19041 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger
2009-05-31 09:57:42 +00:00
parent c2c0c1c023
commit 1207c84adb
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/lcldec.c
View File

@@ -191,8 +191,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
if (c->flags & FLAG_MULTITHREAD) { if (c->flags & FLAG_MULTITHREAD) {
mthread_inlen = *(unsigned int*)encoded; mthread_inlen = *(unsigned int*)encoded;
mthread_outlen = *(unsigned int*)(encoded+4); mthread_outlen = *(unsigned int*)(encoded+4);
if (mthread_outlen > c->decomp_size) // this should not happen mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
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) {
av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%d != %d)\n", av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%d != %d)\n",
@@ -238,8 +237,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
int ret; int ret;
mthread_inlen = *(unsigned int*)encoded; mthread_inlen = *(unsigned int*)encoded;
mthread_outlen = *(unsigned int*)(encoded+4); mthread_outlen = *(unsigned int*)(encoded+4);
if (mthread_outlen > c->decomp_size) mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
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;
ret = zlib_decomp(avctx, encoded + 8 + mthread_inlen, len - mthread_inlen, ret = zlib_decomp(avctx, encoded + 8 + mthread_inlen, len - mthread_inlen,