Merge commit 'b67138598ce158e3083f6295a27b63e2065d5ecb'

* commit 'b67138598ce158e3083f6295a27b63e2065d5ecb':
  vc1: Simplify a little setting the intra variables

Conflicts:
	libavcodec/vc1_block.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/vc1_block.c
index 6f84228,ab7f7a3..5d25629
--- 1/libavcodec/vc1_block.c
--- 2/libavcodec/vc1_block.c
+++ b/libavcodec/vc1_block.c
@@@ -1636,10 -1649,7 +1636,8 @@@ static int vc1_decode_p_mb_intfr(VC1Con
                  s->current_picture.motion_val[1][s->block_index[i]][1] = 0;
              }
              s->current_picture.mb_type[mb_pos]                     = MB_TYPE_INTRA;
 -            s->mb_intra = v->is_intra[s->mb_x] = 1;
 +            s->mb_intra = 1;
 +            v->is_intra[s->mb_x] = 0x3F;
-             for (i = 0; i < 6; i++)
-                 v->mb_type[0][s->block_index[i]] = 1;
              fieldtx = v->fieldtx_plane[mb_pos] = get_bits1(gb);
              mb_has_coeffs = get_bits1(gb);
              if (mb_has_coeffs)
@@@ -2311,10 -2312,7 +2309,8 @@@ static int vc1_decode_b_mb_intfr(VC1Con
              s->mv[1][i][1] = s->current_picture.motion_val[1][s->block_index[i]][1] = 0;
          }
          s->current_picture.mb_type[mb_pos] = MB_TYPE_INTRA;
 -        s->mb_intra = v->is_intra[s->mb_x] = 1;
 +        s->mb_intra = 1;
 +        v->is_intra[s->mb_x] = 0x3F;
-         for (i = 0; i < 6; i++)
-             v->mb_type[0][s->block_index[i]] = 1;
          fieldtx = v->fieldtx_plane[mb_pos] = get_bits1(gb);
          mb_has_coeffs = get_bits1(gb);
          if (mb_has_coeffs)