diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2012-06-29 10:57:39 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-06-29 10:57:39 -0700 |
| commit | e2c5e78ad929d4a6f91895505425b00c5736bd16 (patch) | |
| tree | e94df7e9d3be0c283d73b658551cd434a9b81e31 /vp8/encoder | |
| parent | 31fd98d7244dd452777f37789627a8a2603b35c3 (diff) | |
| parent | 53d92e61ccfb3e7b0ad88c05f732101cc5c5b457 (diff) | |
| download | libvpx-e2c5e78ad929d4a6f91895505425b00c5736bd16.tar libvpx-e2c5e78ad929d4a6f91895505425b00c5736bd16.tar.gz libvpx-e2c5e78ad929d4a6f91895505425b00c5736bd16.tar.bz2 libvpx-e2c5e78ad929d4a6f91895505425b00c5736bd16.zip | |
Merge "Fix decimation_count in drop_frame"
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 25fd394ca..4a57d3b27 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -3454,6 +3454,8 @@ static void encode_frame_to_data_rate else cpi->decimation_count = cpi->decimation_factor; } + else + cpi->decimation_count = 0; /* Decide how big to make the frame */ if (!vp8_pick_frame_size(cpi)) |