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

[Diego Biurrun]

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?

Diego