Ticket #1853: mplayer-1.1-vobsub-ts.patch

sub/vobsub.c

@@ -1280 +1280 @@
         unsigned char buffer[2048];
         unsigned char *p;
         int remain = 2048;
-        /* Do not output twice a line with the same timestamp, this
-           breaks Windows' Vobsub */
-        if (vob->fidx && (!last_pts_set || last_pts != pts)) {
-            static unsigned int last_h = 9999, last_m = 9999, last_s = 9999, last_ms = 9999;
+        /* Only output timestamps which differ more than one millisecond */
+        if (!last_pts_set)
+            last_pts = -1;
+        double pts_diff = pts - last_pts;
+        double abs_pts_diff = pts_diff < 0 ? -pts_diff : pts_diff;
+        if (vob->fidx && abs_pts_diff > 0.001) {
             unsigned int h, m, ms;
             double s;
             s = pts;
@@ -1294 +1296 @@
             ms = (s - (unsigned int) s) * 1000;
             if (ms >= 1000)     /* prevent overflows or bad float stuff */
                 ms = 0;
-            if (h != last_h || m != last_m || (unsigned int) s != last_s || ms != last_ms) {
-                fprintf(vob->fidx, "timestamp: %02u:%02u:%02u:%03u, filepos: %09lx\n",
-                        h, m, (unsigned int) s, ms, ftell(vob->fsub));
-                last_h = h;
-                last_m = m;
-                last_s = (unsigned int) s;
-                last_ms = ms;
-            }
+            fprintf(vob->fidx, "timestamp: %02u:%02u:%02u:%03u, filepos: %09lx\n",
+                    h, m, (unsigned int) s, ms, ftell(vob->fsub));
         }
         last_pts = pts;
         last_pts_set = 1;