diff options
author | Tomas Härdin <tjoppen@acc.umu.se> | 2021-01-27 14:08:55 +0100 |
---|---|---|
committer | Tomas Härdin <tjoppen@acc.umu.se> | 2021-02-01 23:52:55 +0100 |
commit | ff0618b5c4573765045bab58e4eecf4b1fe4d07e (patch) | |
tree | b21d3167e2b1156b30adc7b08e4274dc6bb9c2c4 /libavformat/mxf.c | |
parent | 5441699f8392bc3442f32137d8128d98a3b7b812 (diff) |
avformat/mxf: Establish register of local tags
Tags can be marked "not used" upfront, saving some space in the primer.
av_asserts0() is used to enforce that only tags that are in the primer can actually be written.
Sharing of MasteringDisplay ULs is now done via macros.
Diffstat (limited to 'libavformat/mxf.c')
-rw-r--r-- | libavformat/mxf.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 1901b24c68..85a65f8718 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -22,19 +22,8 @@ #include "libavutil/common.h" #include "mxf.h" -const uint8_t ff_mxf_mastering_display_prefix[13] = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x0e,0x04,0x20,0x04,0x01,0x01 }; - const uint8_t ff_mxf_random_index_pack_key[16] = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x11,0x01,0x00 }; -/* be careful to update references to this array if reordering */ -/* local tags are dynamic and must not clash with others in mxfenc.c */ -const MXFLocalTagPair ff_mxf_mastering_display_local_tags[4] = { - { 0x8301, { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x0e,0x04,0x20,0x04,0x01,0x01,0x01,0x00,0x00 }}, /* Mastering Display Primaries */ - { 0x8302, { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x0e,0x04,0x20,0x04,0x01,0x01,0x02,0x00,0x00 }}, /* Mastering Display White Point Chromaticity */ - { 0x8303, { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x0e,0x04,0x20,0x04,0x01,0x01,0x03,0x00,0x00 }}, /* Mastering Display Maximum Luminance */ - { 0x8304, { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x0e,0x04,0x20,0x04,0x01,0x01,0x04,0x00,0x00 }} /* Mastering Display Minimum Luminance */ -}; - /** * SMPTE RP224 http://www.smpte-ra.org/mdd/index.html */ |