summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-04-11 13:05:08 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-04-12 08:47:33 -0400
commite689a27d621745dea6693f084d83585609bb1e27 (patch)
tree203e8f070252b0989e56890426aaaf543f83119c
parent921a32a30689ff1698df582598f99d48fe8f43c6 (diff)
downloadlibvpx-e689a27d621745dea6693f084d83585609bb1e27.tar
libvpx-e689a27d621745dea6693f084d83585609bb1e27.tar.gz
libvpx-e689a27d621745dea6693f084d83585609bb1e27.tar.bz2
libvpx-e689a27d621745dea6693f084d83585609bb1e27.zip
Bugfix for error accumulator stats
Previous to commit de4e9e3, there was an early return in the alt-ref case that was inadvertantly removed when the function was refactored to return void. This patch restores the prior behavior. Change-Id: I783ffd594a4690297e2742f99526fd7ad67698b2
-rw-r--r--vp8/encoder/pickinter.c1
-rw-r--r--vp8/encoder/rdopt.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index 0759e2d5b..a92bcef91 100644
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -932,6 +932,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int re
}
x->e_mbd.mode_info_context->mbmi.mv.as_int = 0;
+ return;
}
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index aa097b7f7..733585909 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -2479,6 +2479,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
}
x->e_mbd.mode_info_context->mbmi.mv.as_int = 0;
+ return;
}