diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2014-02-13 14:09:55 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-14 06:36:44 -0800 |
| commit | e5dda3b6774c32a83e8ba0815d5273a89f88abef (patch) | |
| tree | 79e83550404b254590da9f175e03b63547baefe5 /vp9 | |
| parent | 27f4b14c65397627326fb1b7cc9ea127640d3d57 (diff) | |
| download | libvpx-e5dda3b6774c32a83e8ba0815d5273a89f88abef.tar libvpx-e5dda3b6774c32a83e8ba0815d5273a89f88abef.tar.gz libvpx-e5dda3b6774c32a83e8ba0815d5273a89f88abef.tar.bz2 libvpx-e5dda3b6774c32a83e8ba0815d5273a89f88abef.zip | |
vp9_ratectrl.h resolve visual studio warnings
Change-Id: If3a2edd744eb76337fa78f34d0e059cda2c6da54
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.h | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 823d868af..29e307023 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -1453,8 +1453,8 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { active_max_gf_interval = 12 + ((int)vp9_convert_qindex_to_q(rc->last_q[INTER_FRAME]) >> 5); - if (active_max_gf_interval > (int)rc->max_gf_interval) - active_max_gf_interval = (int)rc->max_gf_interval; + if (active_max_gf_interval > rc->max_gf_interval) + active_max_gf_interval = rc->max_gf_interval; i = 0; while (i < twopass->static_scene_max_gf_interval && diff --git a/vp9/encoder/vp9_ratectrl.h b/vp9/encoder/vp9_ratectrl.h index 551b6c327..cdd2f11be 100644 --- a/vp9/encoder/vp9_ratectrl.h +++ b/vp9/encoder/vp9_ratectrl.h @@ -34,17 +34,17 @@ typedef struct { double key_frame_rate_correction_factor; double gf_rate_correction_factor; - unsigned int frames_since_golden; - unsigned int frames_till_gf_update_due; // Count down till next GF - unsigned int max_gf_interval; - unsigned int baseline_gf_interval; - unsigned int frames_to_key; - unsigned int frames_since_key; - unsigned int this_key_frame_forced; - unsigned int next_key_frame_forced; - unsigned int source_alt_ref_pending; - unsigned int source_alt_ref_active; - unsigned int is_src_frame_alt_ref; + int frames_since_golden; + int frames_till_gf_update_due; + int max_gf_interval; + int baseline_gf_interval; + int frames_to_key; + int frames_since_key; + int this_key_frame_forced; + int next_key_frame_forced; + int source_alt_ref_pending; + int source_alt_ref_active; + int is_src_frame_alt_ref; int av_per_frame_bandwidth; // Average frame size target for clip int min_frame_bandwidth; // Minimum allocation used for any frame |