diff options
| author | Daniel Kang <ddkang@google.com> | 2012-08-21 15:08:54 -0700 |
|---|---|---|
| committer | Daniel Kang <ddkang@google.com> | 2012-08-21 15:09:42 -0700 |
| commit | 8c2a6cac41aa8b4ce5db266dbe25657f6f15edde (patch) | |
| tree | cc6b50bb1337e7db3c68fd35248c3b7a1f8dc95d | |
| parent | 2a050620e5f4ff55749cd8a7ad981898f5aca6db (diff) | |
| download | libvpx-8c2a6cac41aa8b4ce5db266dbe25657f6f15edde.tar libvpx-8c2a6cac41aa8b4ce5db266dbe25657f6f15edde.tar.gz libvpx-8c2a6cac41aa8b4ce5db266dbe25657f6f15edde.tar.bz2 libvpx-8c2a6cac41aa8b4ce5db266dbe25657f6f15edde.zip | |
Fix compiler warnings
Change-Id: I887cdcf90b87736f2a3805420aa41eed93324bee
| -rw-r--r-- | vp8/decoder/detokenize.c | 3 | ||||
| -rw-r--r-- | 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 adff88a59..a6c837084 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 ac53fa98c..d217f2ffc 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; |