From 1bb4a1a1c41aca40055f3c6ae21aea5edc83b44f Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Sun, 28 Sep 2008 22:58:53 +0000
Subject: [PATCH] matroskadec: set duration only for CODEC_ID_TEXT subtitles
Originally committed as revision 15453 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/matroskadec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 22f70ae87a5..56e3c9bf9bb 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1621,9 +1621,9 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
pkt->pts = timecode;
pkt->pos = pos;
- if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE)
+ if (st->codec->codec_id == CODEC_ID_TEXT)
pkt->convergence_duration = duration;
- else
+ else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE)
pkt->duration = duration;
if (st->codec->codec_id == CODEC_ID_SSA)
--
GitLab