ref: aee577b691223b7430ba16fdd67ca735a535c47a
parent: 6929ab0ba632b4c3d6225d990c50ea49c415a8f5
parent: 40477f1f70556cbd17c7296a332e8014129baa21
author: Yaowu Xu <yaowu@google.com>
date: Mon Jun 20 15:33:33 EDT 2016
Merge "Fix ubsan warning: vp9/encoder/vp9_encodeframe.c"
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -134,7 +134,7 @@
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