lavf: mxf [de]muxer now uses AV_CODEC_ID_SMPTE_436M_ANC instead of ..._NONE

this makes it easier to match against when using that format from other parts of ffmpeg.

Jacob Lifshay committed 1 year ago

Commit a566fcb1 parent f4ff3794 files · +10 −7Browse files

Unified · Split

4 files

@@ -2,6 +2,10 @@ The last version increases of all libraries were on 2025-03-28 · 1 unmodified line
2		2
3	API changes, most recent first:	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	2025-07-10 - xxxxxxxxxx - lavc 62.10.100 - codec_id.h	9	2025-07-10 - xxxxxxxxxx - lavc 62.10.100 - codec_id.h
6	Add AV_CODEC_ID_SMPTE_436M_ANC.	10	Add AV_CODEC_ID_SMPTE_436M_ANC.
7		11

 static const MXFCodecUL mxf_data_essence_container_uls[] = {
     { { 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 },
-    { { 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 },
+    { { 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 },
     { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x09,0x0d,0x01,0x03,0x01,0x02,0x13,0x01,0x01 }, 16, AV_CODEC_ID_TTML },
     { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },  0, AV_CODEC_ID_NONE },
 };
                 st->codecpar->codec_type = type;
             if (container_ul->desc)
                 av_dict_set(&st->metadata, "data_type", container_ul->desc, 0);
-            if (mxf->eia608_extract &&
+            if (mxf->eia608_extract && st->codecpar->codec_id == AV_CODEC_ID_SMPTE_436M_ANC) {
-                container_ul->desc &&
-                !strcmp(container_ul->desc, "vbi_vanc_smpte_436M")) {
                 st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
                 st->codecpar->codec_id = AV_CODEC_ID_EIA_608;
             }

                 return ret;
         } else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) {
             AVDictionaryEntry *e = av_dict_get(st->metadata, "data_type", NULL, 0);
-            if (e && !strcmp(e->value, "vbi_vanc_smpte_436M")) {
+            if ((e && !strcmp(e->value, "vbi_vanc_smpte_436M"))
+                || st->codecpar->codec_id == AV_CODEC_ID_SMPTE_436M_ANC) {
                 sc->index = INDEX_S436M;
             } else {
                 av_log(s, AV_LOG_ERROR, "track %d: unsupported data type\n", i);

@@ -31,8 +31,8 @@ · 30 unmodified lines
31		31
32	#include "version_major.h"	32	#include "version_major.h"
33		33
34	#define LIBAVFORMAT_VERSION_MINOR 1	34	#define LIBAVFORMAT_VERSION_MINOR 2
35	#define LIBAVFORMAT_VERSION_MICRO 103	35	#define LIBAVFORMAT_VERSION_MICRO 100
36		36
37	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \	37	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
38	LIBAVFORMAT_VERSION_MINOR, \	38	LIBAVFORMAT_VERSION_MINOR, \

Keyboard shortcuts