diff options
author | John Koleszar <jkoleszar@google.com> | 2010-12-07 00:05:11 -0500 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2010-12-07 00:05:11 -0500 |
commit | f68820390be6e0f3fc6a635237d66110fe7faf37 (patch) | |
tree | 2683dd2c437fe18dd60fa222391795681c6747e3 /vp8/encoder/onyx_int.h | |
parent | 8d1b8f232298096fea0956cd66a400bcbecb4132 (diff) | |
parent | 9520f4b3cc0710729347ea156ff32ad536ea6a45 (diff) | |
download | libvpx-f68820390be6e0f3fc6a635237d66110fe7faf37.tar libvpx-f68820390be6e0f3fc6a635237d66110fe7faf37.tar.gz libvpx-f68820390be6e0f3fc6a635237d66110fe7faf37.tar.bz2 libvpx-f68820390be6e0f3fc6a635237d66110fe7faf37.zip |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/onyx_int.h')
-rw-r--r-- | vp8/encoder/onyx_int.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index a5fbba312..ecc75c51f 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -245,6 +245,12 @@ enum BLOCK_MAX_SEGMENTS }; +typedef union +{ + unsigned int as_int; + MV as_mv; +} int_mv; /* facilitates rapid equality tests */ + typedef struct { @@ -672,6 +678,10 @@ typedef struct unsigned char *gf_active_flags; // Record of which MBs still refer to last golden frame either directly or through 0,0 int gf_active_count; + //Store last frame's MV info for next frame MV prediction + int_mv *lfmv; + int *lf_ref_frame_sign_bias; + int *lf_ref_frame; } VP8_COMP; |