diff options
| author | John Stebbins <[email protected]> | 2016-12-22 09:31:57 -0800 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2016-12-22 09:31:57 -0800 |
| commit | b762b40feb8d561b09af0ff7e7f9e8a780c79789 (patch) | |
| tree | dd0987d6d5e48e173080e1079f58ea4fe5f3e2f2 /contrib/ffmpeg | |
| parent | 25f869146acf41633870b5887f49f75095f925fa (diff) | |
libav: fix SRT subtitle duration
Diffstat (limited to 'contrib/ffmpeg')
| -rw-r--r-- | contrib/ffmpeg/A03-matroskadec-fix-SRT-subtitle-duration.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/contrib/ffmpeg/A03-matroskadec-fix-SRT-subtitle-duration.patch b/contrib/ffmpeg/A03-matroskadec-fix-SRT-subtitle-duration.patch new file mode 100644 index 000000000..e3c83ca25 --- /dev/null +++ b/contrib/ffmpeg/A03-matroskadec-fix-SRT-subtitle-duration.patch @@ -0,0 +1,31 @@ +From e5ed82a1719ebabda8d2ae7b02ab59dc1c819b4b Mon Sep 17 00:00:00 2001 +From: John Stebbins <[email protected]> +Date: Thu, 22 Dec 2016 09:23:30 -0800 +Subject: [PATCH] matroskadec: fix SRT subtitle duration + +The codec id for SRT was changed and conditionals were not updated. +--- + libavformat/matroskadec.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c +index 8016730..a3954b0 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 +-- +2.7.4 + |