[Ffmpeg-cvslog] r7347 - trunk/libavcodec/mpegvideo.c

[Aurelien Jacobs]

On Thu, 21 Dec 2006 19:33:05 +0100
Michael Niedermayer <michaelni at gmx.at> wrote:

> Hi
> 
> On Thu, Dec 21, 2006 at 06:04:26PM +0100, Aurelien Jacobs wrote:
> > On Thu, 21 Dec 2006 16:46:32 +0100 (CET)
> > michael <subversion at mplayerhq.hu> wrote:
> > 
> > > Author: michael
> > > Date: Thu Dec 21 16:46:32 2006
> > > New Revision: 7347
> > > 
> > > Modified:
> > >    trunk/libavcodec/mpegvideo.c
> > > 
> > > Log:
> > > simplify
> > > 
> > > 
> > > Modified: trunk/libavcodec/mpegvideo.c
> > > ==============================================================================
> > > --- trunk/libavcodec/mpegvideo.c	(original)
> > > +++ trunk/libavcodec/mpegvideo.c	Thu Dec 21 16:46:32 2006
> > > @@ -4350,7 +4350,7 @@
> > >                      if(!s->mb_intra){
> > >                          if(s->pict_type == B_TYPE){
> > >                              if(s->dquant&1)
> > > -                                s->dquant= (s->dquant/2)*2;
> > > +                                s->dquant= 0;
> > >                              if(s->mv_dir&MV_DIRECT)
> > >                                  s->dquant= 0;
> > 
> > Is it right ? Shouldn't it be:
> > 
> >               s->dquant &= ~1;
> 
> no, theres a dquant=clip(X, -2, 2) before this unless my /dev/brain is faulty

OK. Right !

> > 
> > If it's right, maybe simplify even more by merging the 2 if() ?
> > 
> >           if(s->dquant&1 || s->mv_dir&MV_DIRECT)
> >               s->dquant= 0;
> 
> no objections ...

Done.

Aurel