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

[Michael Niedermayer]

On Wed, Nov 16, 2011 at 10:10:37AM -0800, Mike Melanson wrote:
> > 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.

thanks for the review, ill push all in a moment

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I do not agree with what you have to say, but I'll defend to the death your
right to say it. -- Voltaire
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20111116/778bda03/attachment.asc>