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

[aurel]

Author: aurel
Date: Fri Jul  2 18:41:38 2010
New Revision: 24004

Log:
matroskadec: merge only SSA packets together
fixes issue 2052
patch by David Conrad

Modified:
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	Fri Jul  2 18:38:44 2010	(r24003)
+++ trunk/libavformat/matroskadec.c	Fri Jul  2 18:41:38 2010	(r24004)
@@ -1776,7 +1776,8 @@ static int matroska_parse_block(Matroska
                 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);