diff --git a/ChangeLog b/ChangeLog
index 8f726e65f..61ebd1681 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-27  Moritz Bunkus  <moritz@bunkus.org>
 
+	* mkvmerge: bug fix: mkvmerge was wrongly outputting large numbers
+	of warnings when Remuxing AVC/h.264 video from a Matroska file.
+
 	* mmg: bug fix: The job queue was not loaded on startup on Windows
 	Unicode builds (another wxWidgets 2.5.3 problem).
 
diff --git a/src/input/r_matroska.cpp b/src/input/r_matroska.cpp
index 04078bd83..1f725ca2d 100644
--- a/src/input/r_matroska.cpp
+++ b/src/input/r_matroska.cpp
@@ -1471,6 +1471,7 @@ kax_reader_c::create_packetizer(int64_t tid) {
                                                               t->v_width,
                                                               t->v_height,
                                                               nti));
+            PTZR(t->ptzr)->relaxed_timecode_checking = true;
 
           } else {
             mxinfo(FMT_TID "Using the video output module.\n",