diff options
| author | Yaowu Xu <yaowu@google.com> | 2016-06-20 19:33:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-20 19:33:33 +0000 |
| commit | aee577b691223b7430ba16fdd67ca735a535c47a (patch) | |
| tree | 086d92ede48bbffa4a90c417e0fa35da7125c82b /vp9/encoder | |
| parent | 6929ab0ba632b4c3d6225d990c50ea49c415a8f5 (diff) | |
| parent | 40477f1f70556cbd17c7296a332e8014129baa21 (diff) | |
| download | libvpx-aee577b691223b7430ba16fdd67ca735a535c47a.tar libvpx-aee577b691223b7430ba16fdd67ca735a535c47a.tar.gz libvpx-aee577b691223b7430ba16fdd67ca735a535c47a.tar.bz2 libvpx-aee577b691223b7430ba16fdd67ca735a535c47a.zip | |
Merge "Fix ubsan warning: vp9/encoder/vp9_encodeframe.c"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 6af0c0b9d..2ef9a93d8 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -134,7 +134,7 @@ unsigned int vp9_high_get_sby_perpixel_variance( 0, &sse); break; } - return ROUND_POWER_OF_TWO(var, num_pels_log2_lookup[bs]); + return ROUND_POWER_OF_TWO((int64_t)var, num_pels_log2_lookup[bs]); } #endif // CONFIG_VP9_HIGHBITDEPTH |