From dcbd89e0008f54e0ea7865b0d5dd4b644ee7da18 Mon Sep 17 00:00:00 2001
From: Sigga Regina <siggaregina@gmail.com>
Date: Wed, 12 Sep 2018 11:47:47 -0400
Subject: [PATCH] avformat/matroskaenc: reserve free space for metadata on
request
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavformat/matroskaenc.c | 7 +++++++
libavformat/version.h | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index e88d107a903..aed83aef70c 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2012,6 +2012,13 @@ static int mkv_write_header(AVFormatContext *s)
ret = AVERROR(ENOMEM);
goto fail;
}
+
+ if (s->metadata_header_padding > 0) {
+ if (s->metadata_header_padding == 1)
+ s->metadata_header_padding++;
+ put_ebml_void(pb, s->metadata_header_padding);
+ }
+
if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && mkv->reserve_cues_space) {
mkv->cues_pos = avio_tell(pb);
if (mkv->reserve_cues_space == 1)
diff --git a/libavformat/version.h b/libavformat/version.h
index 7032e21adcd..6c996b98742 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 58
#define LIBAVFORMAT_VERSION_MINOR 18
-#define LIBAVFORMAT_VERSION_MICRO 103
+#define LIBAVFORMAT_VERSION_MICRO 104
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
--
GitLab