aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vc1_pred.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-04-19 23:10:07 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-04-19 23:17:56 +0100
commit4d593896aaa81356def8993e8c52294bd8bb2797 (patch)
tree6367cd6e1baa8bc9fbf886a86ec5d9a375b31419 /libavcodec/vc1_pred.c
parent9286de045968ad456d4e752651eec22de5e89060 (diff)
downloadffmpeg-4d593896aaa81356def8993e8c52294bd8bb2797.tar.gz
vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()
Fix a rather lengthy initialization warning from clang.
Diffstat (limited to 'libavcodec/vc1_pred.c')
-rw-r--r--libavcodec/vc1_pred.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/vc1_pred.c b/libavcodec/vc1_pred.c
index 07e9d91f6b..96426f53ea 100644
--- a/libavcodec/vc1_pred.c
+++ b/libavcodec/vc1_pred.c
@@ -468,7 +468,7 @@ 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 total_valid, num_samefield, num_oppfield;
@@ -605,8 +605,7 @@ 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)
@@ -661,8 +660,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 */