diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-03-29 19:48:45 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-03-29 19:48:45 +0000 |
| commit | a345b7f906de89637544d98302819e19bb5b2a5f (patch) | |
| tree | e96ca92219b9c658c82031edea7376f6565b8737 | |
| parent | 67f9bbbb3f6295ca27da7c367f31c6d65339dd4a (diff) | |
| download | ffmpeg-a345b7f906de89637544d98302819e19bb5b2a5f.tar.gz | |
vmdav: use more unchecked bytestream2 variants where it makes sense
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavcodec/vmdav.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index f4364ce3b2..867d8c7666 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -98,7 +98,7 @@ static void lz_unpack(const unsigned char *src, int src_len, if (bytestream2_get_bytes_left(&gb) < 4) return; if (bytestream2_peek_le32(&gb) == 0x56781234) { - bytestream2_get_le32(&gb); + bytestream2_skipu(&gb, 4); qpos = 0x111; speclen = 0xF + 3; } else { @@ -123,7 +123,7 @@ static void lz_unpack(const unsigned char *src, int src_len, if (tag & 0x01) { if (d_end - d < 1 || bytestream2_get_bytes_left(&gb) < 1) return; - queue[qpos++] = *d++ = bytestream2_get_byte(&gb); + queue[qpos++] = *d++ = bytestream2_get_byteu(&gb); qpos &= QUEUE_MASK; dataleft--; } else { @@ -173,7 +173,7 @@ static int rle_unpack(const unsigned char *src, unsigned char *dest, l = (l & 0x7F) * 2; if (dest_end - pd < l || bytestream2_get_bytes_left(&gb) < l) return bytestream2_tell(&gb); - bytestream2_get_buffer(&gb, pd, l); + bytestream2_get_bufferu(&gb, pd, l); pd += l; } else { if (dest_end - pd < i || bytestream2_get_bytes_left(&gb) < 2) @@ -281,7 +281,7 @@ static void vmd_decode(VmdVideoContext *s, AVFrame *frame) len = (len & 0x7F) + 1; if (ofs + len > frame_width || bytestream2_get_bytes_left(&gb) < len) return; - bytestream2_get_buffer(&gb, &dp[ofs], len); + bytestream2_get_bufferu(&gb, &dp[ofs], len); ofs += len; } else { /* interframe pixel copy */ |