this makes it easier to match against when using that format from other parts of ffmpeg.
Unified · Split
| @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2025-03-28 · 1 unmodified line | ||
| 2 | 2 | |
| 3 | 3 | API changes, most recent first: |
| 4 | 4 | |
| 5 | +2025-07-10 - xxxxxxxxxx - lavf 62.2.100 | |
| 6 | + mxf [de]muxer now uses AV_CODEC_ID_SMPTE_436M_ANC for | |
| 7 | + the vbi_vanc_smpte_436M streams instead of AV_CODEC_ID_NONE. | |
| 8 | + | |
| 5 | 9 | 2025-07-10 - xxxxxxxxxx - lavc 62.10.100 - codec_id.h |
| 6 | 10 | Add AV_CODEC_ID_SMPTE_436M_ANC. |
| 7 | 11 | |
| @@ -1685,7 +1685,7 @@ static const MXFCodecUL mxf_sound_essence_container_uls[] = { · 1684 unmodified lines | ||
| 1685 | 1685 | |
| 1686 | 1686 | static const MXFCodecUL mxf_data_essence_container_uls[] = { |
| 1687 | 1687 | { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x09,0x0d,0x01,0x03,0x01,0x02,0x0d,0x00,0x00 }, 16, AV_CODEC_ID_NONE, "vbi_smpte_436M", 11 }, |
| 1688 | − { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x09,0x0d,0x01,0x03,0x01,0x02,0x0e,0x00,0x00 }, 16, AV_CODEC_ID_NONE, "vbi_vanc_smpte_436M", 11 }, | |
| 1688 | + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x09,0x0d,0x01,0x03,0x01,0x02,0x0e,0x00,0x00 }, 16, AV_CODEC_ID_SMPTE_436M_ANC, "vbi_vanc_smpte_436M", 11 }, | |
| 1689 | 1689 | { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x09,0x0d,0x01,0x03,0x01,0x02,0x13,0x01,0x01 }, 16, AV_CODEC_ID_TTML }, |
| 1690 | 1690 | { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, |
| 1691 | 1691 | }; |
| @@ -3115,9 +3115,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) · 1423 unmodified lines | ||
| 3115 | 3115 | st->codecpar->codec_type = type; |
| 3116 | 3116 | if (container_ul->desc) |
| 3117 | 3117 | av_dict_set(&st->metadata, "data_type", container_ul->desc, 0); |
| 3118 | − if (mxf->eia608_extract && | |
| 3119 | − container_ul->desc && | |
| 3120 | − !strcmp(container_ul->desc, "vbi_vanc_smpte_436M")) { | |
| 3118 | + if (mxf->eia608_extract && st->codecpar->codec_id == AV_CODEC_ID_SMPTE_436M_ANC) { | |
| 3121 | 3119 | st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; |
| 3122 | 3120 | st->codecpar->codec_id = AV_CODEC_ID_EIA_608; |
| 3123 | 3121 | } |
| @@ -3074,7 +3074,8 @@ static int mxf_init(AVFormatContext *s) · 3073 unmodified lines | ||
| 3074 | 3074 | return ret; |
| 3075 | 3075 | } else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) { |
| 3076 | 3076 | AVDictionaryEntry *e = av_dict_get(st->metadata, "data_type", NULL, 0); |
| 3077 | − if (e && !strcmp(e->value, "vbi_vanc_smpte_436M")) { | |
| 3077 | + if ((e && !strcmp(e->value, "vbi_vanc_smpte_436M")) | |
| 3078 | + || st->codecpar->codec_id == AV_CODEC_ID_SMPTE_436M_ANC) { | |
| 3078 | 3079 | sc->index = INDEX_S436M; |
| 3079 | 3080 | } else { |
| 3080 | 3081 | av_log(s, AV_LOG_ERROR, "track %d: unsupported data type\n", i); |
| @@ -31,8 +31,8 @@ · 30 unmodified lines | ||
| 31 | 31 | |
| 32 | 32 | #include "version_major.h" |
| 33 | 33 | |
| 34 | −#define LIBAVFORMAT_VERSION_MINOR 1 | |
| 35 | −#define LIBAVFORMAT_VERSION_MICRO 103 | |
| 34 | +#define LIBAVFORMAT_VERSION_MINOR 2 | |
| 35 | +#define LIBAVFORMAT_VERSION_MICRO 100 | |
| 36 | 36 | |
| 37 | 37 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |
| 38 | 38 | LIBAVFORMAT_VERSION_MINOR, \ |