Index: libmpdemux/demuxer.c
===================================================================
--- libmpdemux/demuxer.c	(revision 27776)
+++ libmpdemux/demuxer.c	(working copy)
@@ -475,7 +475,7 @@
                 ds->pts = p->pts;
                 ds->pts_bytes = 0;
             }
-            ds->pts_bytes += p->len;    // !!!
+            //ds->pts_bytes += p->len;    // Do this when updating buffer_pos
             if (p->stream_pts != MP_NOPTS_VALUE)
                 demux->stream_pts = p->stream_pts;
             ds->flags = p->flags;
@@ -534,6 +534,7 @@
             bytes += x;
             len -= x;
             ds->buffer_pos += x;
+            ds->pts_bytes += x;
         }
     }
     return bytes;
@@ -615,6 +616,7 @@
     len = ds->buffer_size - ds->buffer_pos;
     *start = &ds->buffer[ds->buffer_pos];
     ds->buffer_pos += len;
+    ds->pts_bytes += len;
     return len;
 }
 
@@ -635,6 +637,7 @@
     len = ds->buffer_size - ds->buffer_pos;
     *start = &ds->buffer[ds->buffer_pos];
     ds->buffer_pos += len;
+    ds->pts_bytes += len;
     return len;
 }
 
@@ -651,6 +654,7 @@
     len = ds->buffer_size - ds->buffer_pos;
     *start = &ds->buffer[ds->buffer_pos];
     ds->buffer_pos += len;
+    ds->pts_bytes += len;
     return len;
 }