Commit 47f7313e6a for ffmpeg
commit 47f7313e6a3365c77996a20eda7d4487451f1008
Author: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Fri Nov 13 16:37:18 2026 -0800
avformat/mxfenc: number ANC elements from 1
Per ST 436-1, as other ANC writers do.
Signed-off-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index e50b0904da..e29900069a 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -745,7 +745,7 @@ static void mxf_write_essence_container_refs(AVFormatContext *s)
for (i = 0; i < s->nb_streams; i++) {
MXFStreamContext *sc = s->streams[i]->priv_data;
// check first track of essence container type and only write it once
- if (sc->track_essence_element_key[15] != 0)
+ if (sc->track_essence_element_key[15] != (sc->index == INDEX_S436M))
continue;
avio_write(pb, *sc->container_ul, 16);
if (c->essence_container_count == 1)
@@ -3216,6 +3216,9 @@ static int mxf_init(AVFormatContext *s)
// and produce mxf files with the most relevant flavour for opatom
sc->track_essence_element_key[14] = 0x06;
}
+ // ANC element numbers start at 1, ST 436-1
+ if (sc->index == INDEX_S436M)
+ sc->track_essence_element_key[15]++;
PRINT_KEY(s, "track essence element key", sc->track_essence_element_key);
if (!present[sc->index])
diff --git a/tests/ref/fate/mxf-eia608-open-gop b/tests/ref/fate/mxf-eia608-open-gop
index ad9f5a62e5..ad834dfa24 100644
--- a/tests/ref/fate/mxf-eia608-open-gop
+++ b/tests/ref/fate/mxf-eia608-open-gop
@@ -1,4 +1,4 @@
-e8c18926345b3091ec6a6b2ef388251e *tests/data/fate/mxf-eia608-open-gop.mxf
+67afa9e64e27eaec4031cdcfa9d6a7f7 *tests/data/fate/mxf-eia608-open-gop.mxf
165433 tests/data/fate/mxf-eia608-open-gop.mxf
#extradata 0: 22, 0x4e760627
#tb 0: 1001/30000
diff --git a/tests/ref/fate/mxf-eia608-sparse b/tests/ref/fate/mxf-eia608-sparse
index 7f01ad5d15..0682725e62 100644
--- a/tests/ref/fate/mxf-eia608-sparse
+++ b/tests/ref/fate/mxf-eia608-sparse
@@ -1,4 +1,4 @@
-2ba83bbd9c540f6c1691b4c26fbd42c4 *tests/data/fate/mxf-eia608-sparse.mxf
+7b1936e947e131f78a7f1f62656b92d4 *tests/data/fate/mxf-eia608-sparse.mxf
390201 tests/data/fate/mxf-eia608-sparse.mxf
#extradata 0: 22, 0x4e760627
#tb 0: 1001/30000