From: Marton Balint Date: Fri, 19 Feb 2021 23:00:59 +0000 (+0100) Subject: avformat/mxfdec: change toolkit_version metadata field to toolkit_version_num X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7cb40b270ca6f0a0c7f211ccbd3c0331023e920b;p=ffmpeg avformat/mxfdec: change toolkit_version metadata field to toolkit_version_num It only got added recently, and the new name makes it consistent with product_version_num in the next patch. Signed-off-by: Marton Balint --- diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 9f22c386f0a..3ce83dde54b 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2798,7 +2798,7 @@ static int mxf_read_identification_metadata(void *arg, AVIOContext *pb, int tag, SET_TS_METADATA(pb, "modification_date", ts, str); break; case 0x3C07: - SET_VERSION_METADATA(pb, "toolkit_version", major, minor, tertiary, patch, release, str); + SET_VERSION_METADATA(pb, "toolkit_version_num", major, minor, tertiary, patch, release, str); break; case 0x3C08: SET_STR_METADATA(pb, "application_platform", str); diff --git a/tests/ref/fate/matroska-mastering-display-metadata b/tests/ref/fate/matroska-mastering-display-metadata index 4c7469caba9..f9fb54abbf6 100644 --- a/tests/ref/fate/matroska-mastering-display-metadata +++ b/tests/ref/fate/matroska-mastering-display-metadata @@ -1,5 +1,5 @@ -abdf9fa02f44f48a45ba48074cb1d0fe *tests/data/fate/matroska-mastering-display-metadata.matroska -1669691 tests/data/fate/matroska-mastering-display-metadata.matroska +542ababe5c088ab925ee49373d8b8a85 *tests/data/fate/matroska-mastering-display-metadata.matroska +1669695 tests/data/fate/matroska-mastering-display-metadata.matroska #extradata 0: 4, 0x040901a3 #extradata 3: 200, 0x506463a8 #tb 0: 1/1000 diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments index 0dcb04de308..69605d1906d 100644 --- a/tests/ref/fate/mxf-d10-user-comments +++ b/tests/ref/fate/mxf-d10-user-comments @@ -20,7 +20,7 @@ TAG:product_name=FATE-test TAG:product_version=3.14159 TAG:application_platform=Lavf TAG:product_uid=adab4424-2f25-4dc7-92ff-29bd000c0002 -TAG:toolkit_version=0.0.0.0.0 +TAG:toolkit_version_num=0.0.0.0.0 TAG:material_package_umid=0x060A2B340101010501010D001300000000000000000000000000000000000000 TAG:comment_test=value TAG:timecode=01:00:00:00 diff --git a/tests/ref/fate/mxf-probe-applehdr10 b/tests/ref/fate/mxf-probe-applehdr10 index 8a75609bc4a..49ca72cd128 100644 --- a/tests/ref/fate/mxf-probe-applehdr10 +++ b/tests/ref/fate/mxf-probe-applehdr10 @@ -160,7 +160,7 @@ TAG:product_name=Compressor TAG:product_version=4.4.7 (4.4.7) TAG:product_uid=00000000-0000-0000-0000-000000000000 TAG:modification_date=2020-09-08T16:18:57.036000Z -TAG:toolkit_version=3.8.0.171.1 +TAG:toolkit_version_num=3.8.0.171.1 TAG:material_package_umid=0x060A2B340101010501010D201300000045843C9FE69D4B8FA90DDAAA1602A2E8 TAG:timecode=00:01:15;26 [/FORMAT] diff --git a/tests/ref/fate/mxf-probe-dnxhd b/tests/ref/fate/mxf-probe-dnxhd index 8847a15145f..bea06520d7f 100644 --- a/tests/ref/fate/mxf-probe-dnxhd +++ b/tests/ref/fate/mxf-probe-dnxhd @@ -171,7 +171,7 @@ TAG:project_name=UHD TAG:uid=784c8132-ae36-ed4d-b0ff-2edf1f3f2d92 TAG:generation_uid=b6bcfcab-70ff-7331-c47c-478869de11d2 TAG:application_platform=AAFSDK (MacOS X) -TAG:toolkit_version=1.1.0.0.0 +TAG:toolkit_version_num=1.1.0.0.0 TAG:modification_date=2016-09-18T19:25:25.000000Z TAG:product_uid=acfbf03a-4f42-a231-d0b7-c06ecd3d4ad7 TAG:product_version=Unknown version