diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-16 17:25:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-16 20:47:05 +0100 |
| commit | 7056f13a89da1d1f4afd5c6342e7ca6824777125 (patch) | |
| tree | 01943b07d205957dc74bbdb7fa55eca2238d7496 /libavcodec/cinepak.c | |
| parent | cea0c82d9b9771dfa2ac729c13c0d9e03ea352a7 (diff) | |
| download | android_external_ffmpeg-7056f13a89da1d1f4afd5c6342e7ca6824777125.tar.gz android_external_ffmpeg-7056f13a89da1d1f4afd5c6342e7ca6824777125.tar.bz2 android_external_ffmpeg-7056f13a89da1d1f4afd5c6342e7ca6824777125.zip | |
cinepak: remove redundant coordinate checks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cinepak.c')
| -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 a5458cac8e..8ada456b81 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; |