[MPlayer-cvslog] CVS: main/libmpdemux demux_mkv.c,1.58,1.59

[Moritz Bunkus CVS]

CVS change done by Moritz Bunkus CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv20637

Modified Files:
	demux_mkv.c 
Log Message:
Do not give bogus timestamps for laced packets with no default duration. Patch by Uoti Urpala ( uoti ! urpala () pp1 ! inet ! fi ).

Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- demux_mkv.c	14 Apr 2006 21:08:25 -0000	1.58
+++ demux_mkv.c	24 Apr 2006 06:28:45 -0000	1.59
@@ -3143,6 +3143,10 @@
                   if (modified)
                     free (buffer);
                   dp->flags = (block_bref == 0 && block_fref == 0) ? 0x10 : 0;
+                  /* If default_duration is 0, assume no pts value is known
+                   * for packets after the first one (rather than all pts
+                   * values being the same) */
+                  if (i == 0 || track->default_duration)
                   dp->pts = mkv_d->last_pts + i * track->default_duration;
                   ds_add_packet (ds, dp);
                 }