diff --git a/ChangeLog b/ChangeLog
index a7a1d31f1..860cff58d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-13  Moritz Bunkus  <moritz@bunkus.org>
+
+        * all: bug fix: parsing of strings containing negative values or
+        timecodes was broken on 32bit architectures. Fixes #1425.
+
 2015-09-05  Moritz Bunkus  <moritz@bunkus.org>
 
         * MKVToolNix GUI: new merge tool feature: added a column in the
diff --git a/src/common/strings/parsing.cpp b/src/common/strings/parsing.cpp
index c36756905..99f7fc855 100644
--- a/src/common/strings/parsing.cpp
+++ b/src/common/strings/parsing.cpp
@@ -41,8 +41,8 @@ parse_timecode(const std::string &src,
   // HH: is optional; HH, MM and SS can be either one or two digits.
   // 2. HH:MM:SS:nnnnnnnnn  with up to nine digits 'n' for ns precision;
   // HH: is optional; HH, MM and SS can be either one or two digits.
-  int h, m, s, n, values[4], num_values, num_digits, num_colons;
-  size_t offset = 0, negative = 1, i;
+  int h, m, s, n, values[4], num_values, num_digits, num_colons, negative = 1;
+  size_t offset = 0, i;
   bool decimal_point_found;
 
   if (src.empty())