Unified · Split
| @@ -54,6 +54,7 @@ · 53 unmodified lines | ||
| 54 | 54 | #include "libavcodec/bytestream.h" |
| 55 | 55 | #include "libavcodec/defs.h" |
| 56 | 56 | #include "libavcodec/flac.h" |
| 57 | +#include "libavcodec/itut35.h" | |
| 57 | 58 | #include "libavcodec/mpeg4audio.h" |
| 58 | 59 | #include "libavcodec/packet_internal.h" |
| 59 | 60 | |
| @@ -3884,7 +3885,8 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska, · 3824 unmodified lines | ||
| 3884 | 3885 | country_code = bytestream2_get_byteu(&bc); |
| 3885 | 3886 | provider_code = bytestream2_get_be16u(&bc); |
| 3886 | 3887 | |
| 3887 | − if (country_code != 0xB5 || provider_code != 0x3C) | |
| 3888 | + if (country_code != ITU_T_T35_COUNTRY_CODE_US || | |
| 3889 | + provider_code != ITU_T_T35_PROVIDER_CODE_SMTPE) | |
| 3888 | 3890 | break; // ignore |
| 3889 | 3891 | |
| 3890 | 3892 | provider_oriented_code = bytestream2_get_be16u(&bc); |
| @@ -63,6 +63,7 @@ · 62 unmodified lines | ||
| 63 | 63 | #include "libavcodec/codec_desc.h" |
| 64 | 64 | #include "libavcodec/codec_par.h" |
| 65 | 65 | #include "libavcodec/defs.h" |
| 66 | +#include "libavcodec/itut35.h" | |
| 66 | 67 | #include "libavcodec/xiph.h" |
| 67 | 68 | #include "libavcodec/mpeg4audio.h" |
| 68 | 69 | |
| @@ -2824,8 +2825,8 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, · 2755 unmodified lines | ||
| 2824 | 2825 | uint8_t *payload = t35_buf; |
| 2825 | 2826 | size_t payload_size = sizeof(t35_buf) - 6; |
| 2826 | 2827 | |
| 2827 | − bytestream_put_byte(&payload, 0xB5); // country_code | |
| 2828 | − bytestream_put_be16(&payload, 0x3C); // provider_code | |
| 2828 | + bytestream_put_byte(&payload, ITU_T_T35_COUNTRY_CODE_US); | |
| 2829 | + bytestream_put_be16(&payload, ITU_T_T35_PROVIDER_CODE_SMTPE); | |
| 2829 | 2830 | bytestream_put_be16(&payload, 0x01); // provider_oriented_code |
| 2830 | 2831 | bytestream_put_byte(&payload, 0x04); // application_identifier |
| 2831 | 2832 | |