]> git.sesse.net Git - ffmpeg/commitdiff
avformat/matroskaenc: Remove remnant of inline-timing subtitle packets
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>
Thu, 8 Apr 2021 19:54:17 +0000 (21:54 +0200)
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>
Mon, 12 Apr 2021 16:29:23 +0000 (18:29 +0200)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
libavformat/matroskaenc.c

index 7e108f2db9711bb9ec37863e5d11d1c2995790f8..c2848fdcd244f065c89ccafc6375bd4cc14a27b5 100644 (file)
@@ -2188,7 +2188,7 @@ static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, const AVPac
     put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, pkt->duration);
     end_ebml_master(pb, blockgroup);
 
-    return pkt->duration;
+    return 0;
 }
 
 static int mkv_end_cluster(AVFormatContext *s)
@@ -2359,9 +2359,9 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
         }
     } else {
         if (par->codec_id == AV_CODEC_ID_WEBVTT) {
-            duration = mkv_write_vtt_blocks(s, pb, pkt);
-            if (duration < 0)
-                return duration;
+            ret = mkv_write_vtt_blocks(s, pb, pkt);
+            if (ret < 0)
+                return ret;
         } else {
             ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP,
                                                        mkv_blockgroup_size(pkt->size,