summaryrefslogtreecommitdiff
path: root/vp8/encoder/onyx_if.c
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-06-29 00:05:09 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-06-29 00:05:10 -0400
commitfe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a (patch)
tree7f37a3098b214edc8a870a1180bbca69753d2640 /vp8/encoder/onyx_if.c
parentd83b68c62296eee867bdd6b5fd299ad1706e624a (diff)
parentdc004e8c17a1f330ed46eab092ca67e6f785fee1 (diff)
downloadlibvpx-fe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a.tar
libvpx-fe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a.tar.gz
libvpx-fe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a.tar.bz2
libvpx-fe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a.zip
Merge remote branch 'origin/master' into experimental
Change-Id: I68e604e4a731f6703fdec7eff2c2c9b9e36879ea
Diffstat (limited to 'vp8/encoder/onyx_if.c')
-rw-r--r--vp8/encoder/onyx_if.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 4a9b95a2e..125956bea 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -4218,7 +4218,7 @@ static void encode_frame_to_data_rate
update_reference_frames(cm);
- if (cpi->oxcf.error_resilient_mode == 1)
+ if (cpi->oxcf.error_resilient_mode)
{
cm->refresh_entropy_probs = 0;
}