summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-27 14:54:45 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-27 14:54:45 +0000
commit92258be85aede9e17aad1af1ba175b6e93414a34 (patch)
treeeb5612ce6b72a10e02536c72aa7cb50372bb9b6c /libmpdemux
parentd7da0ebc20e5910669a761ab6a02136d9e0040e8 (diff)
downloadmpv-92258be85aede9e17aad1af1ba175b6e93414a34.tar.bz2
mpv-92258be85aede9e17aad1af1ba175b6e93414a34.tar.xz
Simplify and make lzo decompression code more similar to zlib one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22029 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mkv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 3b06e73cde..977261e29e 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -637,9 +637,10 @@ demux_mkv_decode (mkv_track_t *track, uint8_t *src, uint8_t **dest,
return modified;
}
- *dest = malloc (dstlen);
+ *dest = NULL;
while (1)
{
+ *dest = realloc (*dest, dstlen);
result = lzo1x_decompress_safe (src, *size, *dest, &dstlen,
NULL);
if (result == LZO_E_OK)
@@ -655,7 +656,6 @@ demux_mkv_decode (mkv_track_t *track, uint8_t *src, uint8_t **dest,
mp_msg (MSGT_DEMUX, MSGL_DBG2,
"[mkv] lzo decompression buffer too small.\n");
dstlen *= 2;
- *dest = realloc (*dest, dstlen);
}
*size = dstlen;
}