Fix a rather lengthy warning from clang.
---
libavcodec/vc1_pred.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c
index 07e9d91..1168ab3 100644
--- a/libavcodec/vc1_pred.c
+++ b/libavcodec/vc1_pred.c
@@ -468,9 +468,9 @@ void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x,
int dmv_y,
MpegEncContext *s = &v->s;
int xy, wrap, off = 0;
int A[2], B[2], C[2];
- int px, py;
+ int px = 0, py = 0;
int a_valid = 0, b_valid = 0, c_valid = 0;
- int field_a, field_b, field_c; // 0: same, 1: opposit
+ int field_a = 0, field_b = 0, field_c = 0; // 0: same, 1: opposit
int total_valid, num_samefield, num_oppfield;
int pos_c, pos_b, n_adj;
@@ -605,22 +605,15 @@ void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int
dmv_x, int dmv_y,
if (a_valid) { px = A[0]; py = A[1]; }
if (b_valid) { px = B[0]; py = B[1]; }
if (c_valid) { px = C[0]; py = C[1]; }
- } else
- px = py = 0;
+ }
}
} else {
if (a_valid)
field_a = (A[1] & 4) ? 1 : 0;
- else
- field_a = 0;
if (b_valid)
field_b = (B[1] & 4) ? 1 : 0;
- else
- field_b = 0;
if (c_valid)
field_c = (C[1] & 4) ? 1 : 0;
- else
- field_c = 0;
num_oppfield = field_a + field_b + field_c;
num_samefield = total_valid - num_oppfield;
@@ -661,8 +654,7 @@ void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x,
int dmv_y,
} else if (total_valid == 1) {
px = (a_valid) ? A[0] : ((b_valid) ? B[0] : C[0]);
py = (a_valid) ? A[1] : ((b_valid) ? B[1] : C[1]);
- } else
- px = py = 0;
+ }
}
/* store MV using signed modulus of MV range defined in 4.11 */
--
1.9.5 (Apple Git-50.3)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
