Commit 1bb4a1a1 authored by Aurelien Jacobs's avatar Aurelien Jacobs

matroskadec: set duration only for CODEC_ID_TEXT subtitles

Originally committed as revision 15453 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e7d4b743
...@@ -1621,9 +1621,9 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, ...@@ -1621,9 +1621,9 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
pkt->pts = timecode; pkt->pts = timecode;
pkt->pos = pos; pkt->pos = pos;
if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE) if (st->codec->codec_id == CODEC_ID_TEXT)
pkt->convergence_duration = duration; pkt->convergence_duration = duration;
else else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE)
pkt->duration = duration; pkt->duration = duration;
if (st->codec->codec_id == CODEC_ID_SSA) if (st->codec->codec_id == CODEC_ID_SSA)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment