diff options
| author | Alex Converse <aconverse@google.com> | 2014-02-18 15:56:07 -0800 |
|---|---|---|
| committer | Alex Converse <aconverse@google.com> | 2014-02-18 17:04:42 -0800 |
| commit | 2ceaf10e07dd07a242c532259b310948ce3321df (patch) | |
| tree | b1cd1930afd09d31da16a6be1a18bc1abdd13486 /vp9/encoder | |
| parent | e3178d0c1c21534f933cb8196b79e420c5760d1a (diff) | |
| download | libvpx-2ceaf10e07dd07a242c532259b310948ce3321df.tar libvpx-2ceaf10e07dd07a242c532259b310948ce3321df.tar.gz libvpx-2ceaf10e07dd07a242c532259b310948ce3321df.tar.bz2 libvpx-2ceaf10e07dd07a242c532259b310948ce3321df.zip | |
Do not use the value of 'rate_mv' if uninitialized.
This happens when exiting single_motion_search() early due to adaptive_motion_search.
Change-Id: Ic396e7e31e59ff219bb66a459c873c9e5b17400d
Diffstat (limited to 'vp9/encoder')
| -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 a3e879b82..07ef0ff77 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; |