Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: source/libvpx/vp9/common/vp9_systemdependent.h

Issue 54923004: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/vp9/common/vp9_subpelvar.h ('k') | source/libvpx/vp9/common/vp9_tile_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vp9/common/vp9_systemdependent.h
===================================================================
--- source/libvpx/vp9/common/vp9_systemdependent.h (revision 232232)
+++ source/libvpx/vp9/common/vp9_systemdependent.h (working copy)
@@ -13,6 +13,7 @@
#ifdef _MSC_VER
#include <math.h>
+#define snprintf _snprintf
#endif
#include "./vpx_config.h"
@@ -23,8 +24,8 @@
#define vp9_clear_system_state()
#endif
-#ifdef _MSC_VER
-// round is not defined in MSVC
+#if defined(_MSC_VER) && _MSC_VER < 1800
+// round is not defined in MSVC before VS2013.
static int round(double x) {
if (x < 0)
return (int)ceil(x - 0.5);
« no previous file with comments | « source/libvpx/vp9/common/vp9_subpelvar.h ('k') | source/libvpx/vp9/common/vp9_tile_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698