summaryrefslogtreecommitdiff
path: root/vp8/encoder/onyx_int.h
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2012-08-17 10:05:35 -0700
committerYaowu Xu <yaowu@google.com>2012-08-20 11:45:01 -0700
commitd71ba03822ced836c3cfd18417c5fda05de3c833 (patch)
tree76598c6a041509f64c24c23107e11c0f926d8389 /vp8/encoder/onyx_int.h
parent2b59e14a0023be9d084349d58ee156a49cc674bb (diff)
downloadlibvpx-d71ba03822ced836c3cfd18417c5fda05de3c833.tar
libvpx-d71ba03822ced836c3cfd18417c5fda05de3c833.tar.gz
libvpx-d71ba03822ced836c3cfd18417c5fda05de3c833.tar.bz2
libvpx-d71ba03822ced836c3cfd18417c5fda05de3c833.zip
silent compiling warnings for VC9 build
Change-Id: Iaa947e640f27e6f6eaf7d845f243536bca2df513
Diffstat (limited to 'vp8/encoder/onyx_int.h')
-rw-r--r--vp8/encoder/onyx_int.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h
index 584cadae6..caccc60ae 100644
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -236,17 +236,17 @@ typedef struct
int target_bandwidth;
/* Layer specific coding parameters */
- int starting_buffer_level;
- int optimal_buffer_level;
- int maximum_buffer_size;
- int starting_buffer_level_in_ms;
- int optimal_buffer_level_in_ms;
- int maximum_buffer_size_in_ms;
+ int64_t starting_buffer_level;
+ int64_t optimal_buffer_level;
+ int64_t maximum_buffer_size;
+ int64_t starting_buffer_level_in_ms;
+ int64_t optimal_buffer_level_in_ms;
+ int64_t maximum_buffer_size_in_ms;
int avg_frame_size_for_layer;
- int buffer_level;
- int bits_off_target;
+ int64_t buffer_level;
+ int64_t bits_off_target;
int64_t total_actual_bits;
int total_target_vs_actual;
@@ -431,7 +431,7 @@ typedef struct VP8_COMP
double frame_rate;
double ref_frame_rate;
int64_t buffer_level;
- int bits_off_target;
+ int64_t bits_off_target;
int rolling_target_bits;
int rolling_actual_bits;
@@ -569,10 +569,10 @@ typedef struct VP8_COMP
vp8_refining_search_fn_t refining_search_sad;
vp8_diamond_search_fn_t diamond_search_sad;
vp8_variance_fn_ptr_t fn_ptr[BLOCK_MAX_SEGMENTS];
- unsigned int time_receive_data;
- unsigned int time_compress_data;
- unsigned int time_pick_lpf;
- unsigned int time_encode_mb_row;
+ uint64_t time_receive_data;
+ uint64_t time_compress_data;
+ uint64_t time_pick_lpf;
+ uint64_t time_encode_mb_row;
int base_skip_false_prob[128];