From 21a115d17bafa1c07f3959af3f6726eb1cb27bc8 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Thu, 2 Oct 2008 21:14:56 +0000 Subject: matroskadec: don't merge packets which have no timestamp Originally committed as revision 15528 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroskadec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index a0e259c3b5..442a5a013a 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1640,6 +1640,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, 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); -- cgit v1.2.3