[FFmpeg-devel] [PATCH 4/7] avformat/matroska: add a few more Block Addition ID Type enum values

[James Almer]

Signed-off-by: James Almer <jamrial at gmail.com>
---
 libavformat/matroska.h    | 3 +++
 libavformat/matroskadec.c | 4 ++--
 libavformat/matroskaenc.c | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 8a9c1b5119..04719f1d06 100644
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -360,7 +360,10 @@ typedef enum {
 
 typedef enum {
   MATROSKA_BLOCK_ADD_ID_TYPE_DEFAULT                     = 0,
+  MATROSKA_BLOCK_ADD_ID_TYPE_OPAQUE_DATA                 = 1,
   MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35                   = 4,
+  MATROSKA_BLOCK_ADD_ID_TYPE_DVCC                        = 0x64766343,
+  MATROSKA_BLOCK_ADD_ID_TYPE_DVVC                        = 0x64767643,
 } MatroskaBlockAddIDType;
 
 /*
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index b1d2391840..68f9271e73 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2404,8 +2404,8 @@ static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, M
             }
             track->blockaddid_itu_t_t35 = 1;
             break;
-        case MKBETAG('d','v','c','C'):
-        case MKBETAG('d','v','v','C'):
+        case MATROSKA_BLOCK_ADD_ID_TYPE_DVCC:
+        case MATROSKA_BLOCK_ADD_ID_TYPE_DVVC:
             if ((ret = mkv_parse_dvcc_dvvc(s, st, track, &mapping->extradata)) < 0)
                 return ret;
 
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 954b7d828f..46f4331a18 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1612,9 +1612,9 @@ static void mkv_write_dovi(AVFormatContext *s, AVIOContext *pb, AVStream *st)
                                 + (2 + 1 + 4) + (2 + 1 + ISOM_DVCC_DVVC_SIZE);
 
         if (dovi->dv_profile > 7) {
-            type = MKBETAG('d', 'v', 'v', 'C');
+            type = MATROSKA_BLOCK_ADD_ID_TYPE_DVVC;
         } else {
-            type = MKBETAG('d', 'v', 'c', 'C');
+            type = MATROSKA_BLOCK_ADD_ID_TYPE_DVCC;
         }
 
         ff_isom_put_dvcc_dvvc(s, buf, dovi);
-- 
2.40.0