[FFmpeg-cvslog] avformat/matroskadec: set the default value for BlockAddIDType
James Almer
git at videolan.org
Wed Apr 5 15:51:11 EEST 2023
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Mar 19 11:51:24 2023 -0300| [6def862559ec8986a80e8036236ab5a87bad54e1] | committer: James Almer
avformat/matroskadec: set the default value for BlockAddIDType
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6def862559ec8986a80e8036236ab5a87bad54e1
---
libavformat/matroska.h | 4 ++++
libavformat/matroskadec.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 45077ed33f..de63cdc7ae 100644
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -358,6 +358,10 @@ typedef enum {
MATROSKA_VIDEO_PROJECTION_TYPE_MESH = 3,
} MatroskaVideoProjectionType;
+typedef enum {
+ MATROSKA_BLOCK_ADD_ID_TYPE_DEFAULT = 0,
+} MatroskaBlockAddIDType;
+
/*
* Matroska Codec IDs, strings
*/
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index b7f9870f3d..a19b97043c 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -591,7 +591,7 @@ static EbmlSyntax matroska_track_operation[] = {
static EbmlSyntax matroska_block_addition_mapping[] = {
{ MATROSKA_ID_BLKADDIDVALUE, EBML_UINT, 0, 0, offsetof(MatroskaBlockAdditionMapping, value) },
{ MATROSKA_ID_BLKADDIDNAME, EBML_STR, 0, 0, offsetof(MatroskaBlockAdditionMapping, name) },
- { MATROSKA_ID_BLKADDIDTYPE, EBML_UINT, 0, 0, offsetof(MatroskaBlockAdditionMapping, type) },
+ { MATROSKA_ID_BLKADDIDTYPE, EBML_UINT, 0, 0, offsetof(MatroskaBlockAdditionMapping, type), { .u = MATROSKA_BLOCK_ADD_ID_TYPE_DEFAULT } },
{ MATROSKA_ID_BLKADDIDEXTRADATA, EBML_BIN, 0, 0, offsetof(MatroskaBlockAdditionMapping, extradata) },
CHILD_OF(matroska_track)
};
More information about the ffmpeg-cvslog
mailing list