[FFmpeg-cvslog] matroskadec: fix SRT subtitle duration

John Stebbins git at videolan.org
Fri May 5 03:38:45 EEST 2017


ffmpeg | branch: master | John Stebbins <stebbins at jetheaddev.com> | Thu Dec 22 09:23:30 2016 -0800| [0982152c3fb05365597978c5d7cfeeb7ced01723] | committer: John Stebbins

matroskadec: fix SRT subtitle duration

The codec id for SRT was changed and conditionals were not updated.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0982152c3fb05365597978c5d7cfeeb7ced01723
---

 libavformat/matroskadec.c | 4 ++--
 1 file 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



More information about the ffmpeg-cvslog mailing list