# HG changeset patch
# User aurel
# Date 1222982096 0
# Node ID eed7b7cb02a972cb752a5516b58c874beb98d099
# Parent  c265c84caa8185049966699b54ff270a82d06183
matroskadec: don't merge packets which have no timestamp

diff -r c265c84caa81 -r eed7b7cb02a9 matroskadec.c
--- a/matroskadec.c	Thu Oct 02 20:01:13 2008 +0000
+++ b/matroskadec.c	Thu Oct 02 21:14:56 2008 +0000
@@ -1640,6 +1640,7 @@
                     matroska_fix_ass_packet(matroska, pkt, duration);
 
                 if (matroska->prev_pkt &&
+                    timecode != AV_NOPTS_VALUE &&
                     matroska->prev_pkt->pts == timecode &&
                     matroska->prev_pkt->stream_index == st->index)
                     matroska_merge_packets(matroska->prev_pkt, pkt);