[FFmpeg-devel] [PATCH 4/4] cinepak: remove redundant coordinate checks
Mike Melanson
mike at multimedia.cx
Wed Nov 16 19:15:55 CET 2011
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> ---
> libavcodec/cinepak.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
> index a5458ca..8ada456 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;
>
> --
> 1.7.4.1
LGTM.
--
-Mike Melanson
More information about the ffmpeg-devel
mailing list