[FFmpeg-devel] [PATCH]Avoid an assertion failure in ff_init_vlc_sparse

[Carl Eugen Hoyos]

Derek Buitenhuis <derek.buitenhuis <at> gmail.com> writes:

> > -        ff_init_vlc_sparse(&ccitt_vlc[i], 9, CCITT_SYMS,
> > +        ret = ff_init_vlc_sparse(&ccitt_vlc[i], 9, CCITT_SYMS,
> >                             ccitt_codes_lens[i], 1, 1,
> >                             ccitt_codes_bits[i], 1, 1,
> >                             ccitt_syms, 2, 2,
> >                             INIT_VLC_USE_NEW_STATIC);
> > +        if (ret < 0)
> > +            return ret;
> >      }
> 
> Please properly re-indent things like these after, 
> in a separate commit. e.g.:

Of course not, please be a little more careful 
where you review.

> >      if(!aic_top_vlc.bits)
> > -        rv40_init_tables();
> > +        ret = rv40_init_tables();
> > +    if (ret < 0)
> > +        return ret;
> 
> This is wrong. ret is only set if !aic_top_vlc.bits.

Will fix, thank you.

> > -    ff_ccitt_unpack_init();
> > +    ret = ff_ccitt_unpack_init();
> >  
> > -    return 0;
> > +    return ret;
> >  }
> 
> return ff_ccitt_unpack_init()

I considered it but I believe the variant in the patch
is slightly more future-proof.

Carl Eugen