# HG changeset patch
# User aurel
# Date 1278088898 0
# Node ID 806269213b0086b04b8ae6ed40645106cbad1bbf
# Parent  0bc4c96a5aea5941adb23184f478ae1008803843
matroskadec: merge only SSA packets together
fixes issue 2052
patch by David Conrad

diff -r 0bc4c96a5aea -r 806269213b00 matroskadec.c
--- a/matroskadec.c	Fri Jul 02 16:38:44 2010 +0000
+++ b/matroskadec.c	Fri Jul 02 16:41:38 2010 +0000
@@ -1776,7 +1776,8 @@
                 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);