diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-26 08:27:39 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-26 08:27:39 -0400 |
| commit | bbc24a65c41b1a5a460967a2f5719ddb5489c1d5 (patch) | |
| tree | 1b95b4c9a6c2d21a0a0254945b5431ed7ddaabcb /vp8/common/onyxc_int.h | |
| parent | 308e31a3ef97fa7a5bf9a232b15587955e5ec89f (diff) | |
| parent | d5c46bdfc0d7bcc25e3ff549a0dc03d759050c19 (diff) | |
| download | libvpx-bbc24a65c41b1a5a460967a2f5719ddb5489c1d5.tar libvpx-bbc24a65c41b1a5a460967a2f5719ddb5489c1d5.tar.gz libvpx-bbc24a65c41b1a5a460967a2f5719ddb5489c1d5.tar.bz2 libvpx-bbc24a65c41b1a5a460967a2f5719ddb5489c1d5.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/common/alloccommon.c
vp8/encoder/rdopt.c
Change-Id: Ic34b33577423031e277235ffa6bcaff7b252e5cb
Diffstat (limited to 'vp8/common/onyxc_int.h')
| -rw-r--r-- | vp8/common/onyxc_int.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index a91cb337b..e67d39cbb 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -120,7 +120,6 @@ typedef struct VP8Common int experimental; int mb_no_coeff_skip; int no_lpf; - int simpler_lpf; int use_bilinear_mc_filter; int full_pixel; |