Merge commit '5d9d8461fbb87046a7ca220d3676a045bd7ab46e'

* commit '5d9d8461fbb87046a7ca220d3676a045bd7ab46e':
  vc1dec: Don't apply the loop filter on fields

Conflicts:
	tests/ref/fate/vc1_sa10143

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

diff --cc libavcodec/vc1dec.c
index 6bf38e6cb7a8d1033610c2292fdd85567d6975d1,f1dc10aadb286715f4e2e2030e05f9bcbf2456d0..3fbbeaefb06a53909f08bf5f074678b843681b19
--- 1/libavcodec/vc1dec.c
--- 2/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@@ -5074,9 -4651,9 +5075,9 @@@ static void vc1_decode_p_blocks(VC1Cont
          if (s->mb_y != s->start_mb_y) ff_mpeg_draw_horiz_band(s, (s->mb_y - 1) * 16, 16);
          s->first_slice_line = 0;
      }
-     if (apply_loop_filter && v->fcm == PROGRESSIVE) {
+     if (apply_loop_filter) {
          s->mb_x = 0;
 -        ff_init_block_index(s);
 +        init_block_index(v);
          for (; s->mb_x < s->mb_width; s->mb_x++) {
              ff_update_block_index(s);
              vc1_apply_p_loop_filter(v);