diff options
| author | James Almer <jamrial@gmail.com> | 2024-03-11 12:06:56 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-03-19 10:49:20 -0300 |
| commit | 53dd31497b45b651f06bb89cfabd122f97bce38f (patch) | |
| tree | 28c7f977e747105ff67981a7a96a49531db7fa35 | |
| parent | 61519cc6546d4bb590d036fdd3b5ecf346080b69 (diff) | |
| download | ffmpeg-53dd31497b45b651f06bb89cfabd122f97bce38f.tar.gz | |
avformat/matroska: use named constants for ITU-T T.35 metadata
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/matroskadec.c | 4 | ||||
| -rw-r--r-- | libavformat/matroskaenc.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index a35ca6ca5b..8897fd622c 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -54,6 +54,7 @@ #include "libavcodec/bytestream.h" #include "libavcodec/defs.h" #include "libavcodec/flac.h" +#include "libavcodec/itut35.h" #include "libavcodec/mpeg4audio.h" #include "libavcodec/packet_internal.h" @@ -3884,7 +3885,8 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska, country_code = bytestream2_get_byteu(&bc); provider_code = bytestream2_get_be16u(&bc); - if (country_code != 0xB5 || provider_code != 0x3C) + if (country_code != ITU_T_T35_COUNTRY_CODE_US || + provider_code != ITU_T_T35_PROVIDER_CODE_SMTPE) break; // ignore provider_oriented_code = bytestream2_get_be16u(&bc); diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 8ba0690f90..db41d3d1c2 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -63,6 +63,7 @@ #include "libavcodec/codec_desc.h" #include "libavcodec/codec_par.h" #include "libavcodec/defs.h" +#include "libavcodec/itut35.h" #include "libavcodec/xiph.h" #include "libavcodec/mpeg4audio.h" @@ -2824,8 +2825,8 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, uint8_t *payload = t35_buf; size_t payload_size = sizeof(t35_buf) - 6; - bytestream_put_byte(&payload, 0xB5); // country_code - bytestream_put_be16(&payload, 0x3C); // provider_code + bytestream_put_byte(&payload, ITU_T_T35_COUNTRY_CODE_US); + bytestream_put_be16(&payload, ITU_T_T35_PROVIDER_CODE_SMTPE); bytestream_put_be16(&payload, 0x01); // provider_oriented_code bytestream_put_byte(&payload, 0x04); // application_identifier |