diff options
author | Deb Mukherjee <debargha@google.com> | 2014-01-14 13:57:17 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-14 13:57:17 -0800 |
commit | fc43938d5e1c965052e623758b03c75444fa3c9f (patch) | |
tree | 475cc27a095aeeddf1b42fa7c3ff85b278db5cae | |
parent | 903ba1a1ab934c468153a3a97f1f337e20afdeae (diff) | |
parent | 1699d6bd53a81d8844d297f98ec752ff8551ffff (diff) | |
download | libvpx-fc43938d5e1c965052e623758b03c75444fa3c9f.tar libvpx-fc43938d5e1c965052e623758b03c75444fa3c9f.tar.gz libvpx-fc43938d5e1c965052e623758b03c75444fa3c9f.tar.bz2 libvpx-fc43938d5e1c965052e623758b03c75444fa3c9f.zip |
Merge "Minor fix on an assert"
-rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 8e60bc96d..669fe0a97 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -3420,7 +3420,7 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, #endif frames_to_arf = cpi->rc.frames_till_gf_update_due; - assert(frames_to_arf < cpi->rc.frames_to_key); + assert(frames_to_arf <= cpi->rc.frames_to_key); if ((cpi->source = vp9_lookahead_peek(cpi->lookahead, frames_to_arf))) { #if CONFIG_MULTIPLE_ARF diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 939a7f998..aefef5319 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -965,5 +965,5 @@ void vp9_rc_postencode_update(VP9_COMP *cpi, uint64_t bytes_used) { void vp9_rc_postencode_update_drop_frame(VP9_COMP *cpi) { cpi->rc.frames_since_key++; - // cpi->rc.frames_to_key--; + cpi->rc.frames_to_key--; } |