Merge commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71'

* commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71':
  vc1dec: Redesign the intensity compensation

Conflicts:
	libavcodec/vc1.c
	libavcodec/vc1dec.c

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

libavcodec/vc1.c

@@ -600,7 +600,6 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex
         }                                                                     \
     } while(0)
 
-
 static void rotate_luts(VC1Context *v)
 {
 #define ROTATE(DEF, L, N, C, A) do {                          \
@@ -712,9 +711,8 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
             (v->s.pict_type == AV_PICTURE_TYPE_P) ? 'P' : ((v->s.pict_type == AV_PICTURE_TYPE_I) ? 'I' : 'B'),
             pqindex, v->pq, v->halfpq, v->rangeredfrm);
 
-    if(v->first_pic_header_flag) {
+    if (v->first_pic_header_flag)
         rotate_luts(v);
-    }
 
     switch (v->s.pict_type) {
     case AV_PICTURE_TYPE_P:
@@ -986,9 +984,8 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
     if (v->parse_only)
         return 0;
 
-    if(v->first_pic_header_flag) {
+    if (v->first_pic_header_flag)
         rotate_luts(v);
-    }
 
     switch (v->s.pict_type) {
     case AV_PICTURE_TYPE_I: