virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

matroskadec: fix SRT subtitle duration

Browse Source 
The codec id for SRT was changed and conditionals were not updated.
This commit is contained in:
John Stebbins
2016-12-22 09:23:30 -08:00
parent 1316446779
commit 0982152c3f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/matroskadec.c
View File

@@ -2439,11 +2439,11 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
else else
pkt->pts = timecode; pkt->pts = timecode;
pkt->pos = pos; 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; pkt->duration = duration;
#if FF_API_CONVERGENCE_DURATION #if FF_API_CONVERGENCE_DURATION
FF_DISABLE_DEPRECATION_WARNINGS 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; pkt->convergence_duration = duration;
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif