diff options
| author | Sven Gothel <[email protected]> | 2017-12-28 12:01:41 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2017-12-28 12:01:41 +0100 |
| commit | 0bbd618792a6441c2593c318672944725f431f50 (patch) | |
| tree | 8e16c4586d4ab0f3e2951b5060b171c4c6970e77 | |
| parent | fb37291733561ccab02e02737916411b3af2a543 (diff) | |
FFMPEG: Enable A01-matroskaenc-pgs-duration patch
See http://ffmpeg.org/pipermail/ffmpeg-devel/2017-November/219642.html
| -rw-r--r-- | contrib/ffmpeg/A01-matroskaenc-pgs-duration.patch (renamed from contrib/ffmpeg/old/A01-matroskaenc-pgs-duration.patch) | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/contrib/ffmpeg/old/A01-matroskaenc-pgs-duration.patch b/contrib/ffmpeg/A01-matroskaenc-pgs-duration.patch index 9463905c8..550ebae15 100644 --- a/contrib/ffmpeg/old/A01-matroskaenc-pgs-duration.patch +++ b/contrib/ffmpeg/A01-matroskaenc-pgs-duration.patch @@ -13,19 +13,20 @@ Fixes mkvalidator error messages for PGS subtitles. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c -index 4ec474d..628300b 100644 +index dad6d6c..61ce0f7 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c -@@ -1487,7 +1487,8 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt) - mkv_blockgroup_size(pkt->size)); - duration = pkt->convergence_duration; - mkv_write_block(s, pb, MATROSKA_ID_BLOCK, pkt, 0); -- put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration); -+ if (duration > 0) -+ put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration); - end_ebml_master(pb, blockgroup); - } - +@@ -2396,7 +2396,8 @@ FF_ENABLE_DEPRECATION_WARNINGS + #endif + /* All subtitle blocks are considered to be keyframes. */ + mkv_write_block(s, pb, MATROSKA_ID_BLOCK, pkt, 1); +- put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration); ++ if (duration > 0) ++ put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration); + end_ebml_master(pb, blockgroup); + } + + -- 1.9.3 |