From patchwork Mon May 7 10:38:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8823 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2711484jad; Mon, 7 May 2018 03:39:56 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr6p4MNzn+KQclo97vPwE7UGRwhtaYmvcVGgIr5Mo89UXtXNzkpmz7bQvIZ5MY5N5Hxo8s8 X-Received: by 2002:adf:9787:: with SMTP id s7-v6mr31667504wrb.61.1525689596406; Mon, 07 May 2018 03:39:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525689596; cv=none; d=google.com; s=arc-20160816; b=ebWfkCdlNtXpOe6SuJtY2HJMiLnp1Nax4gQ9PU0TYjwThirctOVsotPBBbK548byYg 4PyoQAzzQzEzYF6u2e3SgqeAlejvmVvH85biq2jrp393qoIYUM9AiMxFDLNo2ZdTVKip utfD0B2Myv+0++sCLjpLalGmIj3kwhD/1hsvMGaY3z/lRlZvK1GNHTLHAnAzj8bQH1zu lqvA4gW/u5kiLWH4uNiqAIQgV85nZhM7Mpa1u/5qEK3Ph3dup6QGHUfeujeTh0nUV0Gt mvCm8Uw+ztwOX//Nsy84NM7vhnKdiPLJG4uBmEzIaacuWYm9VgFsQrMWdXMBgLHecQEZ 3WZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=yp96ew0ZNIeohJC1kkUKS4KP97hljEnEKPoMKsKlPGo=; b=xq1zdYXtf8Xqrw6+f9eZAIl9cbeHuS5GrZQ/6QLivv++wK4orbBp3B+QI3xzKux78Q 4OALacMTVOM90EU/r6RQazX8HqDk1Gn6csD3PW273Pl7RuEMITMzHwNYZljUAhEcY4dW G2gHjQLJFtfAgT8TkrnPZu33SY0hS9bSHXZ7JTbnfMLHun1zg1WYhiONl1hf8p1eF9QC m9MkAfwLnJTZ+axe9SzkdFdgxZOYRoHYgktxGom3VTHiUDXzr/BTk5grS5lffEHyKYxR Yju0UdjaKJMo1bpZAk1wslWgdCvRR1eQM533kTiz3nK8a47RvbBCZb9oHJoRg5ttxxyS wsJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 90-v6si19437768wro.441.2018.05.07.03.39.55; Mon, 07 May 2018 03:39:56 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D7AB68A575; Mon, 7 May 2018 13:39:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-1.mx.upcmail.net (vie01a-qmta-pe01-1.mx.upcmail.net [62.179.121.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BFE968A3D1 for ; Mon, 7 May 2018 13:39:12 +0300 (EEST) Received: from [172.31.218.41] (helo=vie01a-dmta-pe04-2.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fFdYZ-00074r-0e for ffmpeg-devel@ffmpeg.org; Mon, 07 May 2018 12:39:47 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fFdYS-0000Fs-Oj for ffmpeg-devel@ffmpeg.org; Mon, 07 May 2018 12:39:40 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id jNfe1x00w0S5wYM01Nffnl; Mon, 07 May 2018 12:39:39 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 7 May 2018 12:38:06 +0200 Message-Id: <20180507103817.8320-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180507103817.8320-1-michael@niedermayer.cc> References: <20180507103817.8320-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 02/13] avformat/mxfenc: Bump minor versions for S377-1-2009 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavformat/mxfenc.c | 4 ++-- tests/ref/fate/copy-trac4914 | 2 +- tests/ref/fate/mxf-reel_name | 2 +- tests/ref/fate/time_base | 2 +- tests/ref/lavf/mxf | 6 +++--- tests/ref/lavf/mxf_d10 | 2 +- tests/ref/lavf/mxf_dv25 | 2 +- tests/ref/lavf/mxf_dvcpro50 | 2 +- tests/ref/lavf/mxf_opatom | 2 +- tests/ref/lavf/mxf_opatom_audio | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index c0db10b3c2..00dfce977b 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -691,7 +691,7 @@ static void mxf_write_preface(AVFormatContext *s) // write version mxf_write_local_tag(pb, 2, 0x3B05); - avio_wb16(pb, 258); // v1.2 + avio_wb16(pb, 259); // v1.2 // write identification_refs mxf_write_local_tag(pb, 16 + 8, 0x3B06); @@ -1710,7 +1710,7 @@ static int mxf_write_partition(AVFormatContext *s, int bodysid, // write partition value avio_wb16(pb, 1); // majorVersion - avio_wb16(pb, 2); // minorVersion + avio_wb16(pb, 3); // minorVersion avio_wb32(pb, KAG_SIZE); // KAGSize avio_wb64(pb, partition_offset); // ThisPartition diff --git a/tests/ref/fate/copy-trac4914 b/tests/ref/fate/copy-trac4914 index 06eac9e621..0964f96fdd 100644 --- a/tests/ref/fate/copy-trac4914 +++ b/tests/ref/fate/copy-trac4914 @@ -1,4 +1,4 @@ -9097dd426106c40288262b53cc6fdb83 *tests/data/fate/copy-trac4914.mxf +6da61d6b9b654c9b1e8f70be01fae7f7 *tests/data/fate/copy-trac4914.mxf 561209 tests/data/fate/copy-trac4914.mxf #tb 0: 1001/30000 #media_type 0: video diff --git a/tests/ref/fate/mxf-reel_name b/tests/ref/fate/mxf-reel_name index 7350d2c0bf..ecd818f539 100644 --- a/tests/ref/fate/mxf-reel_name +++ b/tests/ref/fate/mxf-reel_name @@ -1 +1 @@ -625c69eb3801368737266128efdd0a8c +3d81a5c7479617d2f082a828db5e1d80 diff --git a/tests/ref/fate/time_base b/tests/ref/fate/time_base index 75ec4368a4..a1c578acfa 100644 --- a/tests/ref/fate/time_base +++ b/tests/ref/fate/time_base @@ -1 +1 @@ -0979b614a34f668eb47278448b254000 +39441bec6d05cd65adc0f5b8557fe8ad diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index 1aff1a0509..a5f3db200d 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ -47c67e4309c680ce91df5396541ee31e *./tests/data/lavf/lavf.mxf +0c59c7eb43abd8fbd9eab41dc0bec1d0 *./tests/data/lavf/lavf.mxf 525881 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0x8dddfaab -8e5f8bc13d7c888f4b6320f9869d49d5 *./tests/data/lavf/lavf.mxf +6b0e6f16dfd1ba0524bf14f16d50b86d *./tests/data/lavf/lavf.mxf 561209 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xf21b1b48 -c49f8d4743c8dcc33fa01e6dcb995a38 *./tests/data/lavf/lavf.mxf +b9e4dbb9a9b65fadf47509ef2b094fe5 *./tests/data/lavf/lavf.mxf 525881 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0x8dddfaab diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10 index 3af1d7e2d7..6db0d0ea10 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -3c256050ae20973760dd4e72d854d0dc *./tests/data/lavf/lavf.mxf_d10 +bac717411fd88894e71db6b5268a75bc *./tests/data/lavf/lavf.mxf_d10 5331501 ./tests/data/lavf/lavf.mxf_d10 ./tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488 diff --git a/tests/ref/lavf/mxf_dv25 b/tests/ref/lavf/mxf_dv25 index 9d95083393..b17542bbce 100644 --- a/tests/ref/lavf/mxf_dv25 +++ b/tests/ref/lavf/mxf_dv25 @@ -1,3 +1,3 @@ -aed946d56c81da2f01974b3805d56f87 *./tests/data/lavf/lavf.mxf_dv25 +06549669b096e58a3a57279004532ed2 *./tests/data/lavf/lavf.mxf_dv25 3833901 ./tests/data/lavf/lavf.mxf_dv25 ./tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52 diff --git a/tests/ref/lavf/mxf_dvcpro50 b/tests/ref/lavf/mxf_dvcpro50 index 2965be97c3..64115766b6 100644 --- a/tests/ref/lavf/mxf_dvcpro50 +++ b/tests/ref/lavf/mxf_dvcpro50 @@ -1,3 +1,3 @@ -e9cecd6f83c7bff8c41195ce23b3d0b2 *./tests/data/lavf/lavf.mxf_dvcpro50 +6b3297c1f3af13398719ffd4e194e87b *./tests/data/lavf/lavf.mxf_dvcpro50 7430701 ./tests/data/lavf/lavf.mxf_dvcpro50 ./tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4 diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom index 6369e91198..153537e14a 100644 --- a/tests/ref/lavf/mxf_opatom +++ b/tests/ref/lavf/mxf_opatom @@ -1,3 +1,3 @@ -e8f8bce1c9c92c678f0e9b3350984282 *./tests/data/lavf/lavf.mxf_opatom +e1568a9638de2883ca8cfa63c044432c *./tests/data/lavf/lavf.mxf_opatom 4717113 ./tests/data/lavf/lavf.mxf_opatom ./tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a diff --git a/tests/ref/lavf/mxf_opatom_audio b/tests/ref/lavf/mxf_opatom_audio index 57c957853a..ffddde0f3a 100644 --- a/tests/ref/lavf/mxf_opatom_audio +++ b/tests/ref/lavf/mxf_opatom_audio @@ -1,3 +1,3 @@ -2fc8da147ec62c5ba98598bbb2737515 *./tests/data/lavf/lavf.mxf_opatom_audio +63a33b96d0a8e10d5e9dd6c1dfd2b63b *./tests/data/lavf/lavf.mxf_opatom_audio 102457 ./tests/data/lavf/lavf.mxf_opatom_audio ./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff