[FFmpeg-devel] [PATCH 1/4] cinepak: simplify, use FFMIN()

Mike Melanson mike at multimedia.cx
Wed Nov 16 19:10:37 CET 2011


> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> ---
>  libavcodec/cinepak.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
> index 9069b7e..68ffe5c 100644
> --- a/libavcodec/cinepak.c
> +++ b/libavcodec/cinepak.c
> @@ -357,8 +357,7 @@ static int cinepak_decode (CinepakContext *s)
>
>      s->data += 10 + s->sega_film_skip_bytes;
>
> -    if (num_strips > MAX_STRIPS)
> -        num_strips = MAX_STRIPS;
> +    num_strips = FFMIN(num_strips, MAX_STRIPS);
>
>      s->frame.key_frame = 0;
>
> --
> 1.7.4.1

Fine.

--
    -Mike Melanson



More information about the ffmpeg-devel mailing list