diff options
author | John Koleszar <jkoleszar@google.com> | 2011-07-30 00:05:09 -0400 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2011-07-30 00:05:09 -0400 |
commit | 87e570e6bea5564c36f9464e099bf72b7cebbd5d (patch) | |
tree | b368b720a4beb19369a94a4ac4e545a60f85e5c5 /vp8/encoder | |
parent | c521abeb49d96a519c6773377e36c59dcfdf99f6 (diff) | |
parent | 6f080f9cec229bac78f78b5726849793aea91fd5 (diff) | |
download | libvpx-87e570e6bea5564c36f9464e099bf72b7cebbd5d.tar libvpx-87e570e6bea5564c36f9464e099bf72b7cebbd5d.tar.gz libvpx-87e570e6bea5564c36f9464e099bf72b7cebbd5d.tar.bz2 libvpx-87e570e6bea5564c36f9464e099bf72b7cebbd5d.zip |
Merge remote branch 'origin/master' into experimental
Change-Id: I473166452c0ed5a4219b5e7d96a91a6641b11b9d
Diffstat (limited to 'vp8/encoder')
-rw-r--r-- | vp8/encoder/picklpf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/picklpf.c b/vp8/encoder/picklpf.c index 49de62d7d..beefe8d8e 100644 --- a/vp8/encoder/picklpf.c +++ b/vp8/encoder/picklpf.c @@ -161,7 +161,7 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) if (cm->sharpness_level != cm->last_sharpness_level) { vp8_loop_filter_update_sharpness(&cm->lf_info, cm->sharpness_level); - cm->last_sharpness_level = cm->last_sharpness_level; + cm->last_sharpness_level = cm->sharpness_level; } // Start the search at the previous frame filter level unless it is now out of range. |