From: Dmitry Kovalev <dkovalev@google.com>
Date: Fri, 3 Jan 2014 23:57:36 +0000 (-0800)
Subject: Merge "Replacing CHECK_BOUNDS macro with inline check_bounds function."
X-Git-Tag: v1.4.0~2754
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed2fba2a79efd9d32e5e082f1fbe4ca4a54ed058;p=platform%2Fupstream%2Flibvpx.git

Merge "Replacing CHECK_BOUNDS macro with inline check_bounds function."
---

ed2fba2a79efd9d32e5e082f1fbe4ca4a54ed058
diff --cc vp9/encoder/vp9_mcomp.c
index 706a185,aec8de3..5e74d1a
--- a/vp9/encoder/vp9_mcomp.c
+++ b/vp9/encoder/vp9_mcomp.c
@@@ -537,9 -737,8 +535,8 @@@ static int vp9_pattern_search(MACROBLOC
    uint8_t *base_offset;
    uint8_t *this_offset;
    int k = -1;
-   int all_in;
    int best_site = -1;
 -  int_mv fcenter_mv;
 +  MV fcenter_mv;
    int best_init_s = search_param_to_steps[search_param];
    int *mvjsadcost = x->nmvjointsadcost;
    int *mvsadcost[2] = {x->nmvsadcost[0], x->nmvsadcost[1]};