FFMPEG: Enable A01-matroskaenc-pgs-duration patch

See http://ffmpeg.org/pipermail/ffmpeg-devel/2017-November/219642.html

diff --git a/contrib/ffmpeg/old/A01-matroskaenc-pgs-duration.patch b/contrib/ffmpeg/A01-matroskaenc-pgs-duration.patch
similarity index 56%
rename from contrib/ffmpeg/old/A01-matroskaenc-pgs-duration.patch
rename to contrib/ffmpeg/A01-matroskaenc-pgs-duration.patch
index 9463905c8a11f12233d705aa6504793aa433e1d3..550ebae15a6b21a3212536a9378d20fd68e33239 100644 (file)
--- 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