aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2008-09-04 23:08:19 +0000
committerAurelien Jacobs <aurel@gnuage.org>2008-09-04 23:08:19 +0000
commit62c24705c84204fdcd44318d20caace076636eb1 (patch)
tree2d7ea635b22bdc785f2b5dbb4531d92b16bb11d8 /libavformat/matroskadec.c
parent647148c638596a3aaac17a8f2a9547cb7b45212d (diff)
downloadffmpeg-62c24705c84204fdcd44318d20caace076636eb1.tar.gz
matroska: subtitle display duration must be stored in pkt->convergence_duration
Originally committed as revision 15206 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r--libavformat/matroskadec.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index b947a50e0a..437ac3717e 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1583,7 +1583,10 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
pkt->pts = timecode;
pkt->pos = pos;
- pkt->duration = duration;
+ if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE)
+ pkt->convergence_duration = duration;
+ else
+ pkt->duration = duration;
dynarray_add(&matroska->packets, &matroska->num_packets, pkt);
}