virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Simplify checks, use that we know that cnt will not be < 0

Browse Source 
Originally committed as revision 7787 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2007-01-31 21:00:48 +00:00
parent 56f8647aaa
commit c0a8b87600
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/lzo.c
View File

@ -86,11 +86,11 @@ static inline int get_len(LZOContext *c, int x, int mask) {
static inline void copy(LZOContext *c, int cnt) { static inline void copy(LZOContext *c, int cnt) {
register uint8_t *src = c->in; register uint8_t *src = c->in;
register uint8_t *dst = c->out; register uint8_t *dst = c->out;
if (src + cnt > c->in_end || src + cnt < src) { if (cnt > c->in_end - src) {
cnt = c->in_end - src; cnt = c->in_end - src;
c->error |= LZO_INPUT_DEPLETED; c->error |= LZO_INPUT_DEPLETED;
} }
if (dst + cnt > c->out_end || dst + cnt < dst) { if (cnt > c->out_end - dst) {
cnt = c->out_end - dst; cnt = c->out_end - dst;
c->error |= LZO_OUTPUT_FULL; c->error |= LZO_OUTPUT_FULL;
} }
@ -121,7 +121,7 @@ static inline void copy_backptr(LZOContext *c, int back, int cnt) {
c->error |= LZO_INVALID_BACKPTR; c->error |= LZO_INVALID_BACKPTR;
return; return;
} }
if (dst + cnt > c->out_end || dst + cnt < dst) { if (cnt > c->out_end - dst) {
cnt = c->out_end - dst; cnt = c->out_end - dst;
c->error |= LZO_OUTPUT_FULL; c->error |= LZO_OUTPUT_FULL;
} }