From 8c2a6cac41aa8b4ce5db266dbe25657f6f15edde Mon Sep 17 00:00:00 2001
From: Daniel Kang <ddkang@google.com>
Date: Tue, 21 Aug 2012 15:08:54 -0700
Subject: [PATCH] Fix compiler warnings
Change-Id: I887cdcf90b87736f2a3805420aa41eed93324bee
---
vp8/decoder/detokenize.c | 3 ++-
vp8/encoder/rdopt.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/vp8/decoder/detokenize.c b/vp8/decoder/detokenize.c
index adff88a59d..a6c8370843 100644
--- a/vp8/decoder/detokenize.c
+++ b/vp8/decoder/detokenize.c
@@ -295,6 +295,7 @@ static int vp8_decode_coefs(VP8D_COMP *dx, const MACROBLOCKD *xd,
const vp8_prob *prob, *coef_probs;
switch (block_type) {
+ default:
case TX_4X4:
coef_probs = fc->coef_probs[type][0][0];
break;
@@ -302,7 +303,7 @@ static int vp8_decode_coefs(VP8D_COMP *dx, const MACROBLOCKD *xd,
coef_probs = fc->coef_probs_8x8[type][0][0];
break;
#if CONFIG_TX16X16
- default:
+ case TX_16X16:
coef_probs = fc->coef_probs_16x16[type][0][0];
break;
#endif
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index ac53fa98cb..d217f2ffc7 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -2943,7 +2943,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
int uv_intra_rate_8x8 = 0, uv_intra_distortion_8x8 = 0, uv_intra_rate_tokenonly_8x8 = 0;
int uv_intra_skippable_8x8 = 0;
int rate_y, UNINITIALIZED_IS_SAFE(rate_uv);
- int distortion_uv;
+ int distortion_uv = INT_MAX;
int64_t best_yrd = INT64_MAX;
#if CONFIG_PRED_FILTER
int best_filter_state;
--
GitLab