Mercurial > libavformat.hg

changeset 6223:806269213b00 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
matroskadec: merge only SSA packets together fixes issue 2052 patch by David Conrad
author aurel
date Fri, 02 Jul 2010 16:41:38 +0000
parents 0bc4c96a5aea
children 4c7c979b1f5a
files matroskadec.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);