diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-04 00:28:17 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-04 00:28:17 +0200 |
| commit | 9790f4e6e72cdc8093be966d3d6e007c8f44a035 (patch) | |
| tree | 3d4a19a910d34be6ee7cd4841876a4318d5c243d /libmpdemux/demux_mkv.c | |
| parent | ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3 (diff) | |
| parent | 09bf506c34a73d587c999ce161a0714159e1e5b6 (diff) | |
| download | mpv-9790f4e6e72cdc8093be966d3d6e007c8f44a035.tar.bz2 mpv-9790f4e6e72cdc8093be966d3d6e007c8f44a035.tar.xz | |
Merge svn changes up to r28461
Diffstat (limited to 'libmpdemux/demux_mkv.c')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 682a1b3f13..aff05bd92d 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -348,12 +348,12 @@ demux_mkv_decode (mkv_track_t *track, uint8_t *src, uint8_t **dest, while (1) { 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 (dstlen > SIZE_MAX - AV_LZO_OUTPUT_PADDING) goto lzo_fail; + *dest = realloc (*dest, dstlen + AV_LZO_OUTPUT_PADDING); + result = av_lzo1x_decode (*dest, &dstlen, src, &srclen); if (result == 0) break; - if (!(result & LZO_OUTPUT_FULL)) + if (!(result & AV_LZO_OUTPUT_FULL)) { lzo_fail: mp_msg (MSGT_DEMUX, MSGL_WARN, @@ -856,7 +856,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 + LZO_INPUT_PADDING); + track->private_data = malloc (num + AV_LZO_INPUT_PADDING); if (stream_read(s, track->private_data, num) != (int) num) goto err_out; track->private_size = num; @@ -2872,8 +2872,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); - if (block_length > SIZE_MAX - LZO_INPUT_PADDING) return 0; - block = malloc (block_length + LZO_INPUT_PADDING); + if (block_length > SIZE_MAX - AV_LZO_INPUT_PADDING) return 0; + block = malloc (block_length + AV_LZO_INPUT_PADDING); demuxer->filepos = stream_tell (s); if (stream_read (s,block,block_length) != (int) block_length) { |