diff options
| author | John Stebbins <stebbins@jetheaddev.com> | 2016-12-22 09:23:30 -0800 |
|---|---|---|
| committer | John Stebbins <stebbins@jetheaddev.com> | 2016-12-24 08:33:17 -0800 |
| commit | 0982152c3fb05365597978c5d7cfeeb7ced01723 (patch) | |
| tree | 97b3c85935d7b11315616c958f811783f9408512 /libavformat | |
| parent | 131644677970a3c4a0096270ea2a5b5d437c2e63 (diff) | |
| download | ffmpeg-0982152c3fb05365597978c5d7cfeeb7ced01723.tar.gz | |
matroskadec: fix SRT subtitle duration
The codec id for SRT was changed and conditionals were not updated.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 8016730965..a3954b0c4e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2439,11 +2439,11 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, else pkt->pts = timecode; pkt->pos = pos; - if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE || st->codecpar->codec_id == AV_CODEC_ID_TEXT) + if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE || st->codecpar->codec_id == AV_CODEC_ID_SRT) pkt->duration = duration; #if FF_API_CONVERGENCE_DURATION FF_DISABLE_DEPRECATION_WARNINGS - if (st->codecpar->codec_id == AV_CODEC_ID_TEXT) + if (st->codecpar->codec_id == AV_CODEC_ID_SRT) pkt->convergence_duration = duration; FF_ENABLE_DEPRECATION_WARNINGS #endif |