Module: libav Branch: release/12 Commit: b2477425929300060ce0cae6b0bd4056929714eb
Author: John Stebbins <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Thu Dec 22 09:23:30 2016 -0800 matroskadec: fix SRT subtitle duration The codec id for SRT was changed and conditionals were not updated. (cherry picked from commit 0982152c3fb05365597978c5d7cfeeb7ced01723) Signed-off-by: Anton Khirnov <[email protected]> --- libavformat/matroskadec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 7ccba57..bca2d1d 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2440,11 +2440,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 _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
