[FFmpeg-cvslog] r14542 - trunk/libavcodec/h264.c

[Michael Niedermayer]

On Tue, Aug 05, 2008 at 09:40:04AM +0200, Diego Biurrun wrote:
> On Tue, Aug 05, 2008 at 12:59:53AM +0200, michael wrote:
> > 
> > --- trunk/libavcodec/h264.c	(original)
> > +++ trunk/libavcodec/h264.c	Tue Aug  5 00:59:53 2008
> > @@ -1150,8 +1150,7 @@ static inline void pred_direct_motion(H2
> >          const int *map_col_to_list0[2] = {h->map_col_to_list0[0], h->map_col_to_list0[1]};
> >          const int *dist_scale_factor = h->dist_scale_factor;
> >  
> > -        if(FRAME_MBAFF){
> > -            if(IS_INTERLACED(*mb_type)){
> > +            if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){
> >                  map_col_to_list0[0] = h->map_col_to_list0_field[0];
> >                  map_col_to_list0[1] = h->map_col_to_list0_field[1];
> >                  dist_scale_factor = h->dist_scale_factor_field;
> > @@ -1244,7 +1243,6 @@ static inline void pred_direct_motion(H2
> >                  return;
> >              }
> > -        }
> 
> This needs a reindent, which I have in my local tree.  Shall I commit it
> or will I produce conflicts on your side and should hold off?

it will produce conflicts, please hold off, ill fix the indention when iam
done with the next round(s) of cleanups

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

I am the wisest man alive, for I know one thing, and that is that I know
nothing. -- Socrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/attachments/20080805/337a3316/attachment.pgp>