Merge commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 10:00:50 +0000 (11:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 10:05:15 +0000 (11:05 +0100)
* commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a':
  vc1pred: remove logically dead code

Conflicts:
libavcodec/vc1_pred.c

See: fca435fee167da981f024e35d9fef4e6179b8061
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vc1_pred.c

@@@ -644,23 -645,18 +644,20 @@@ void ff_vc1_pred_mv_intfr(VC1Context *v
                  } else if (!field_b && b_valid) {
                      px = B[0];
                      py = B[1];
 -                } else if (c_valid) {
 +                } else /*if (c_valid)*/ {
 +                    av_assert1(c_valid);
                      px = C[0];
                      py = C[1];
-                 } /*else px = py = 0;*/
+                 }
              } else {
                  if (field_a && a_valid) {
                      px = A[0];
                      py = A[1];
 -                } else if (field_b && b_valid) {
 +                } else /*if (field_b && b_valid)*/ {
 +                    av_assert1(field_b && b_valid);
                      px = B[0];
                      py = B[1];
-                 } /*else if (c_valid) {
-                     px = C[0];
-                     py = C[1];
-                 }*/
+                 }
              }
          } else if (total_valid == 1) {
              px = (a_valid) ? A[0] : ((b_valid) ? B[0] : C[0]);