Commit 70362e450f for ffmpeg

commit 70362e450f5db64278438b62be88b19a1629cdf3
Author: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date:   Thu Nov 12 16:30:49 2026 -0800

    avformat/mxf: read the ITU-R BT.470 PAL transfer label as gamma 2.8

    Signed-off-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>

diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index 8d93965476..d74d226301 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -112,7 +112,7 @@ const MXFCodecUL ff_mxf_color_primaries_uls[] = {
 };

 const MXFCodecUL ff_mxf_color_trc_uls[] = {
-    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x01,0x00,0x00 }, 14, AVCOL_TRC_GAMMA22 }, /* ITU-R BT.470 */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x01,0x00,0x00 }, 14, AVCOL_TRC_GAMMA28 }, /* ITU-R BT.470 PAL */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x02,0x00,0x00 }, 14, AVCOL_TRC_BT709 }, /* ITU-R BT.709 */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x03,0x00,0x00 }, 14, AVCOL_TRC_SMPTE240M }, /* SMPTE 240M */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x04,0x00,0x00 }, 14, AVCOL_TRC_BT709 }, /* SMPTE 274/296M (must appear after ITU-R BT.709) */
@@ -128,7 +128,7 @@ const MXFCodecUL ff_mxf_color_trc_uls[] = {
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x01,0x01,0x01,0x12,0x00,0x00 }, 14, AVCOL_TRC_LINEAR }, /* Cinema Mezzanine Linear (must appear after Linear) */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0D,0x04,0x01,0x01,0x01,0x01,0x13,0x00,0x00 }, 14, AVCOL_TRC_SMPTE428 }, /* Cinema Mezzanine DCDM (must appear after SMPTE-DC28 DCDM) */
     /* alternate mappings for encoding */
-    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x01,0x00,0x00 }, 14, AVCOL_TRC_GAMMA28 }, /* = AVCOL_TRC_GAMMA22 */
+    { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x01,0x00,0x00 }, 14, AVCOL_TRC_GAMMA22 }, /* = AVCOL_TRC_GAMMA28, also covers System M */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x02,0x00,0x00 }, 14, AVCOL_TRC_SMPTE170M }, /* = AVCOL_TRC_BT709 */
     { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0E,0x04,0x01,0x01,0x01,0x01,0x09,0x00,0x00 }, 14, AVCOL_TRC_BT2020_12 }, /* = AVCOL_TRC_BT2020_10 */

diff --git a/tests/ref/fate/matroska-encoding-delay b/tests/ref/fate/matroska-encoding-delay
index 162eaf2edf..833ce827e2 100644
--- a/tests/ref/fate/matroska-encoding-delay
+++ b/tests/ref/fate/matroska-encoding-delay
@@ -1,4 +1,4 @@
-e0a9bc2eff3a462c6664488d9126b1f0 *tests/data/fate/matroska-encoding-delay.matroska
+ef9e4953d3814dcd548c37ecb743ff65 *tests/data/fate/matroska-encoding-delay.matroska
 961246 tests/data/fate/matroska-encoding-delay.matroska
 #extradata 0:       22, 0x32ea0490
 #tb 0: 1/1000
diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments
index 9f3092f4af..614c7c19a3 100644
--- a/tests/ref/fate/mxf-d10-user-comments
+++ b/tests/ref/fate/mxf-d10-user-comments
@@ -1,12 +1,12 @@
-d0dae277c0cb07f517ae2b456658f123 *tests/data/fate/mxf-d10-user-comments.mxf_d10
+ca2d9a476892e92928d48ada9e72b152 *tests/data/fate/mxf-d10-user-comments.mxf_d10
 3782189 tests/data/fate/mxf-d10-user-comments.mxf_d10
-#extradata 0:       34, 0x716b05c4
+#extradata 0:       34, 0x717105c5
 #tb 0: 1/25
 #media_type 0: video
 #codec_id 0: mpeg2video
 #dimensions 0: 1280x720
 #sar 0: 3/4
-0,         -1,          0,        1,   150000, 0xa811adc1
+0,         -1,          0,        1,   150000, 0xf203adc2
 0,          0,          1,        1,   150000, 0x4952bac6, F=0x0
 0,          1,          2,        1,   150000, 0x6b437346, F=0x0
 0,          2,          3,        1,   150000, 0x36dbac43, F=0x0
diff --git a/tests/ref/fate/mxf-probe-d10 b/tests/ref/fate/mxf-probe-d10
index e5d701e1de..a6467baac8 100644
--- a/tests/ref/fate/mxf-probe-d10
+++ b/tests/ref/fate/mxf-probe-d10
@@ -16,7 +16,7 @@ display_aspect_ratio=4:3
 pix_fmt=yuv422p
 color_range=tv
 color_space=unknown
-color_transfer=bt470m
+color_transfer=bt470bg
 color_primaries=unknown
 chroma_location=topleft
 field_order=tt
diff --git a/tests/ref/fate/mxf-probe-dv25 b/tests/ref/fate/mxf-probe-dv25
index 052c3e29eb..50cf6c7cee 100644
--- a/tests/ref/fate/mxf-probe-dv25
+++ b/tests/ref/fate/mxf-probe-dv25
@@ -16,7 +16,7 @@ display_aspect_ratio=4:3
 pix_fmt=yuv420p
 color_range=tv
 color_space=unknown
-color_transfer=bt470m
+color_transfer=bt470bg
 color_primaries=unknown
 chroma_location=topleft
 field_order=bb