diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-01 00:05:13 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-06-01 00:05:13 -0400 |
| commit | 2289ba4b9c98ab2f34daaff53f131ff79f5ed59d (patch) | |
| tree | e77d8cb77eb3bc246cd408dca8d6b9017ace8edb /vp8/encoder/onyx_if.c | |
| parent | d63ce5db34815029159b2ed87e3c6ce65c276662 (diff) | |
| parent | 9e4f76c154a355bac2a3e005e47882219801bdae (diff) | |
| download | libvpx-2289ba4b9c98ab2f34daaff53f131ff79f5ed59d.tar libvpx-2289ba4b9c98ab2f34daaff53f131ff79f5ed59d.tar.gz libvpx-2289ba4b9c98ab2f34daaff53f131ff79f5ed59d.tar.bz2 libvpx-2289ba4b9c98ab2f34daaff53f131ff79f5ed59d.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I1e7ce466bc01e380eb392b964ba677f0bb8cd13b
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 8a9dfb40b..0472b63b9 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -2016,13 +2016,13 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) cpi->total_ssimg_all = 0; } +#endif + #ifndef LLONG_MAX #define LLONG_MAX 9223372036854775807LL #endif cpi->first_time_stamp_ever = LLONG_MAX; -#endif - cpi->frames_till_gf_update_due = 0; cpi->key_frame_count = 1; |