[FFmpeg-cvslog] avformat/matroskaenc: Remove remnant of inline-timing subtitle packets
Andreas Rheinhardt
git at videolan.org
Mon Apr 12 19:57:16 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Thu Apr 8 21:54:17 2021 +0200| [85709a90c3517e3429bb1206d26f7238dbd6a1bd] | committer: Andreas Rheinhardt
avformat/matroskaenc: Remove remnant of inline-timing subtitle packets
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=85709a90c3517e3429bb1206d26f7238dbd6a1bd
---
libavformat/matroskaenc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 7e108f2db9..c2848fdcd2 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -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,
More information about the ffmpeg-cvslog
mailing list