diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-16 17:25:39 +0100 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2011-11-18 11:58:45 +0200 |
commit | a4009c6a9adc9ea38eb56967b6a5e933451ae545 (patch) | |
tree | 32d335777c9d0ad185ca462cf4eb628495e99e8c | |
parent | 867b496681b3cdc774b80764fbea42f7c9aca842 (diff) | |
download | ffmpeg-a4009c6a9adc9ea38eb56967b6a5e933451ae545.tar.gz |
cinepak: remove redundant coordinate checks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r-- | libavcodec/cinepak.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index a858d6e866..8ae1bb3f2b 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -269,8 +269,8 @@ static int cinepak_decode_strip (CinepakContext *s, int chunk_id, chunk_size; /* coordinate sanity checks */ - if (strip->x1 >= s->width || strip->x2 > s->width || - strip->y1 >= s->height || strip->y2 > s->height || + if (strip->x2 > s->width || + strip->y2 > s->height || strip->x1 >= strip->x2 || strip->y1 >= strip->y2) return -1; |