diff options
| author | Alex Converse <aconverse@google.com> | 2014-02-19 12:41:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-19 12:41:14 -0800 |
| commit | 43b7959dbc2361f5ec23e9fd9aaa8e4f14599783 (patch) | |
| tree | 9555e641e161faf9b62e63457246990d1c047ad7 /vp9/encoder/vp9_rdopt.c | |
| parent | 1ea12f5b5fbe410601ee3d16906bd1272dffa1ed (diff) | |
| parent | 2ceaf10e07dd07a242c532259b310948ce3321df (diff) | |
| download | libvpx-43b7959dbc2361f5ec23e9fd9aaa8e4f14599783.tar libvpx-43b7959dbc2361f5ec23e9fd9aaa8e4f14599783.tar.gz libvpx-43b7959dbc2361f5ec23e9fd9aaa8e4f14599783.tar.bz2 libvpx-43b7959dbc2361f5ec23e9fd9aaa8e4f14599783.zip | |
Merge "Do not use the value of 'rate_mv' if uninitialized."
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 074af0e96..f500907bc 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2708,6 +2708,8 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, int_mv tmp_mv; single_motion_search(cpi, x, tile, bsize, mi_row, mi_col, &tmp_mv, &rate_mv); + if (tmp_mv.as_int == INVALID_MV) + return INT64_MAX; *rate2 += rate_mv; frame_mv[refs[0]].as_int = xd->mi_8x8[0]->bmi[0].as_mv[0].as_int = tmp_mv.as_int; |