diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 5a79712..2139ab7 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1636,8 +1636,9 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
 
                 pkt->pts = timecode;
                 pkt->pos = pos;
-                if (st->codec->codec_id == CODEC_ID_TEXT)
+                if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE)
                     pkt->convergence_duration = duration;
+#if 0
                 else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE)
                     pkt->duration = duration;
 
@@ -1650,9 +1651,9 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
                     matroska->prev_pkt->stream_index == st->index)
                     matroska_merge_packets(matroska->prev_pkt, pkt);
                 else {
+#endif
                     dynarray_add(&matroska->packets,&matroska->num_packets,pkt);
                     matroska->prev_pkt = pkt;
-                }
             }
 
             if (timecode != AV_NOPTS_VALUE)