virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vmdav: use more unchecked bytestream2 variants where it makes sense

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-03-29 19:48:45 +00:00
parent 67f9bbbb3f
commit a345b7f906
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vmdav.c
View File

@ -98,7 +98,7 @@ static void lz_unpack(const unsigned char *src, int src_len,
if (bytestream2_get_bytes_left(&gb) < 4) if (bytestream2_get_bytes_left(&gb) < 4)
return; return;
if (bytestream2_peek_le32(&gb) == 0x56781234) { if (bytestream2_peek_le32(&gb) == 0x56781234) {
bytestream2_get_le32(&gb); bytestream2_skipu(&gb, 4);
qpos = 0x111; qpos = 0x111;
speclen = 0xF + 3; speclen = 0xF + 3;
} else { } else {
@ -123,7 +123,7 @@ static void lz_unpack(const unsigned char *src, int src_len,
if (tag & 0x01) { if (tag & 0x01) {
if (d_end - d < 1 || bytestream2_get_bytes_left(&gb) < 1) if (d_end - d < 1 || bytestream2_get_bytes_left(&gb) < 1)
return; return;
queue[qpos++] = *d++ = bytestream2_get_byte(&gb); queue[qpos++] = *d++ = bytestream2_get_byteu(&gb);
qpos &= QUEUE_MASK; qpos &= QUEUE_MASK;
dataleft--; dataleft--;
} else { } else {
@ -173,7 +173,7 @@ static int rle_unpack(const unsigned char *src, unsigned char *dest,
l = (l & 0x7F) * 2; l = (l & 0x7F) * 2;
if (dest_end - pd < l || bytestream2_get_bytes_left(&gb) < l) if (dest_end - pd < l || bytestream2_get_bytes_left(&gb) < l)
return bytestream2_tell(&gb); return bytestream2_tell(&gb);
bytestream2_get_buffer(&gb, pd, l); bytestream2_get_bufferu(&gb, pd, l);
pd += l; pd += l;
} else { } else {
if (dest_end - pd < i || bytestream2_get_bytes_left(&gb) < 2) 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; len = (len & 0x7F) + 1;
if (ofs + len > frame_width || bytestream2_get_bytes_left(&gb) < len) if (ofs + len > frame_width || bytestream2_get_bytes_left(&gb) < len)
return; return;
bytestream2_get_buffer(&gb, &dp[ofs], len); bytestream2_get_bufferu(&gb, &dp[ofs], len);
ofs += len; ofs += len;
} else { } else {
/* interframe pixel copy */ /* interframe pixel copy */