diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-31 23:28:34 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-31 23:28:34 +0000 |
| commit | 20d8af25bece94926eef7ed22bde9a18f9c39ea6 (patch) | |
| tree | 600171e6c5870dc15bc829e3ed73552e7be41ac9 /libmpdemux/demux_mkv.c | |
| parent | 17cb5504b14805bf5821556206a7a810206850e9 (diff) | |
| download | mpv-20d8af25bece94926eef7ed22bde9a18f9c39ea6.tar.bz2 mpv-20d8af25bece94926eef7ed22bde9a18f9c39ea6.tar.xz | |
Make mkv demuxer use ffmpeg LZO as well.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22099 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 977261e29e..b46c3bcaee 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -36,10 +36,10 @@ #include <zlib.h> #endif -#ifdef USE_LIBLZO -#include <lzo1x.h> +#ifdef USE_LIBAVUTIL_SO +#include <ffmpeg/lzo.h> #else -#include "libmpcodecs/native/minilzo.h" +#include "libavutil/lzo.h" #endif #if !defined(MIN) @@ -630,23 +630,18 @@ demux_mkv_decode (mkv_track_t *track, uint8_t *src, uint8_t **dest, /* lzo encoded track */ int dstlen = *size * 3; - if (lzo_init () != LZO_E_OK) - { - mp_msg (MSGT_DEMUX, MSGL_WARN, - MSGTR_MPDEMUX_MKV_LzoInitializationFailed); - return modified; - } - *dest = NULL; while (1) { - *dest = realloc (*dest, dstlen); - result = lzo1x_decompress_safe (src, *size, *dest, &dstlen, - NULL); - if (result == LZO_E_OK) + int srclen = *size; + if (dstlen > SIZE_MAX - LZO_OUTPUT_PADDING) goto lzo_fail; + *dest = realloc (*dest, dstlen + LZO_OUTPUT_PADDING); + result = lzo1x_decode (*dest, &dstlen, src, &srclen); + if (result == 0) break; - if (result != LZO_E_OUTPUT_OVERRUN) + if (!(result & LZO_OUTPUT_FULL)) { +lzo_fail: mp_msg (MSGT_DEMUX, MSGL_WARN, MSGTR_MPDEMUX_MKV_LzoDecompressionFailed); free(*dest); @@ -1157,7 +1152,7 @@ demux_mkv_read_trackentry (demuxer_t *demuxer) // audit: cheap guard against overflows later.. if (num > SIZE_MAX - 1000) return 0; l = x + num; - track->private_data = malloc (num); + track->private_data = malloc (num + LZO_INPUT_PADDING); if (stream_read(s, track->private_data, num) != (int) num) goto err_out; track->private_size = num; @@ -3409,7 +3404,8 @@ demux_mkv_fill_buffer (demuxer_t *demuxer, demux_stream_t *ds) case MATROSKA_ID_BLOCK: block_length = ebml_read_length (s, &tmp); free(block); - block = malloc (block_length); + if (block_length > SIZE_MAX - LZO_INPUT_PADDING) return 0; + block = malloc (block_length + LZO_INPUT_PADDING); demuxer->filepos = stream_tell (s); if (stream_read (s,block,block_length) != (int) block_length) { |