[FFmpeg-cvslog] r15528 - trunk/libavformat/matroskadec.c

[aurel]

Author: aurel
Date: Thu Oct  2 23:14:56 2008
New Revision: 15528

Log:
matroskadec: don't merge packets which have no timestamp

Modified:
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	(original)
+++ trunk/libavformat/matroskadec.c	Thu Oct  2 23:14:56 2008
@@ -1640,6 +1640,7 @@ static int matroska_parse_block(Matroska
                     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);