From 41c1ccc332eba2785a84b883dee96d214a41db2c Mon Sep 17 00:00:00 2001 From: David Conrad Date: Fri, 2 Jul 2010 16:41:38 +0000 Subject: [PATCH] matroskadec: merge only SSA packets together fixes issue 2052 patch by David Conrad Originally committed as revision 24004 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroskadec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 4430e7bfea..954ef3b863 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1776,7 +1776,8 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, if (matroska->prev_pkt && timecode != AV_NOPTS_VALUE && matroska->prev_pkt->pts == timecode && - matroska->prev_pkt->stream_index == st->index) + matroska->prev_pkt->stream_index == st->index && + st->codec->codec_id == CODEC_ID_SSA) matroska_merge_packets(matroska->prev_pkt, pkt); else { dynarray_add(&matroska->packets,&matroska->num_packets,pkt);