From patchwork Sun Jan 16 23:03:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33615 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2272392iog; Sun, 16 Jan 2022 15:04:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxy/q8jotG110bZoqG+9rlkY8v3rEsiZsa8cXNw88aKSZ7YFc0w8K6q1Q0UEi3pkg4ThLVw X-Received: by 2002:a17:907:6d1b:: with SMTP id sa27mr14909708ejc.182.1642374282916; Sun, 16 Jan 2022 15:04:42 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e16si3181290edz.161.2022.01.16.15.04.42; Sun, 16 Jan 2022 15:04:42 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="Qzlpo/Q2"; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DCAC968AEBD; Mon, 17 Jan 2022 01:04:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073048.outbound.protection.outlook.com [40.92.73.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B3B668AE74 for ; Mon, 17 Jan 2022 01:04:27 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RHDvieCOTwG4Z7MT597bWqKGXyP/xAaM5tg96IwiHa6hBi2AZmbZ8ZG3IYxaBpH8ZAQAw0ynqC1LOw0rUraTYK2OBrIO5oSU9Hz5zZAF7XUdHRIQcCHQl2N3UebkrvzGZbnWAfin6TZjr5qxZeDWRJ5F3jG7oLjvsxqNGLtuq4ggDoDyriVMq2ASzvVmReL9m/XYJTRu8qyPOuYEHYQEeDZ1GOSDxi7kG9cyss417QKBezXCfuKV42cjvQRHxyKgKwteTq9DwiHljr2icMhVW0Cvav5wouMga4ODJyWVKKd1urgijb/MtOmSPv+8MgOAtkI/Xz2/DFpVRuTwCCmyOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1a9RtAnMLniH69kugHEao4/CFh1uW83A4yj+pJNV7f0=; b=nWBaNEFPOagJ0v6RoIUjBPyq0ZSd7ZE7Fp44Kng/GMvaxWj3YBUPxt7kTRxUeZ+DE/GkWDUKxiEJLakbsh/c7HKpmCacDVK++GNEUPSDp5mCz9PCstNV2Jpm8uq8idFrmS1lC3Go3tceN3Etydo5cDIX/8wg/oyPBJZg409ELDPboOlSoNBfWo2qlIuonlwVKQCJE2B23sQnIy3NcA+FVnaqdq0v98jnGhauPO+IPCm2ewdEIsFoliQTEKffK7QuUMyRWf2OCCuAmXZByVT6FwPOHxImKehYI4odQasGXkXm2k2tm7SQ+h/pbN9k5QQe5Q9/KV0RceKto4jMHQCufg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1a9RtAnMLniH69kugHEao4/CFh1uW83A4yj+pJNV7f0=; b=Qzlpo/Q2iKSNLeZWYrn333G7EsuwVfNLyCua6ivywZqk3fORv4ysZ7busXU2jC6QG9kOEqV5LhSz/fDNztfwL9mYooIFbrsHGK9Qp16wHTOOGv4lp1LFyMsImmf2FLEzrxY7i64lQfPRqwP9z/k1PQfr6eDeWK9KMSFsRfALII5Mynl02K25+JBmvz7zo7pXQwZQVndtHuOXI3VHogOT7vJyk49oOO5aXrYmjT/fuQZCo/W6NZz2VCfuuYs4aMXqWOqfm/Ai1lAcFi2s+MDXV/jA5Z393cjsCpyPiRVAbW7tGa8NeKfU85keZgmpGuHaMKBfTC1aaF0Id79kbSPWaQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7704.eurprd03.prod.outlook.com (2603:10a6:20b:403::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Sun, 16 Jan 2022 23:04:25 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 23:04:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jan 2022 00:03:44 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [x2rWx2btSO9kdHkIwgO3Ff/UPf8YKKXH] X-ClientProxiedBy: AM0PR10CA0070.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:15::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220116230405.194506-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7b75eb19-54ed-492f-acce-08d9d9448a6f X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuZvKHt/RRJ4O3wxWCrUcc4nfNgvZzzzWJSNaK3vnCJ+GHOmJ9UHjMqI/8RC5FexaARReoMdw19lJEmk4F5NpnRGHsqSmlXYCZoKpwdfRM74yMoqNBwcYwO1YZIBtWjYtSoBZsiLAPUQhX9rODPMHLNHYjv+yzypecqyidH8yF7UbjyHLkwpAMSWrKHUZy86sohUyDxi3gMTNt39N8tw5VivkZ6JbkgJkdJ2RZKZ21+Vz3uWwNMcdVeHUDD4iCaapopbd8nAUPJE0uJYuVcvI1PipBfzLr8BjJNZ/1FB+UrV36o60wdA1a8oV9jmxKnSvUnJiGP2aFM5QzjqNghYHLNSwg3nnIeykZ/4LfmkNw76NsLiAahWaXo7j6s+sjsayrGbiLBSnoCoD8PsyOD3Xa7sCb4Q1jS/ynWibd5S8oRC7gXgSB1+6PBtWN0xNB5wfEB2w4wl2MKEH4mtRDYucJMDUajsvki/teX25IthW30cnFqnrE1ZVbecqJ8JlAWKM+yv/FWkRlbSq8z+0IS5Hx5FJdKaYjjrFp+eFytDckpIVpigivok0M6zlaNV0DUyQGjKNTHf9EIAWvGIqpiNgcvnXlUbFBIIK4Y7zVj7+gJWbsUAtrC1ReGwLbvMYHCJxYiqPEzpX/a1SZSkBOf2cG3SEU65q1/9GffNmIb/h4qBXvDmaJY4TsfUu4toOP5cs7Ewp6PcI8YVW3BOrWtks5OMKNwit+eqmuCGfWw8SJBqDbV0hQMkcHm1Ked/OCsaNzaOYTNdiBWytZh4FOg8GJK X-MS-TrafficTypeDiagnostic: AS8PR03MB7704:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 92KwqhnWCyXFiKRGcL2mGjo4ZKg+38wikZvHjQyJUrlfy+/zjQnvMJumogb6ljjVmwvRsPcTTRHoUuB/oe5pqzTvdqUWkcsO0o/gubeZPcdDOubJHBfJujupRYxhEhjBI1kvT61NLipLyTkdgtov3TfhzS9reVrVlNqyAJzadU1VDTygRThZ6yNRGK8nyDBOYq2WMQNiWYB98MggKGba1CNUIyEXHdchC7MgH67/Gu0TMqxmgCDz3Le4fOzEQrtM4yWH+2oY59c47n9pCYlOmmzeqcSe+vpCG0YhXbP1mTOI3v0HxYZJChPIIv/NWPg19TaeSvNxJ74Ln748orCvlO3Ug9ie14wJshgYyp5ANFCX25aj+eDtbhHtYmRLAPzk55UEs221si1C9sjqPt3Ec+NrpiJIcDrN3MFcyqvNFLClpvMDFHSQpYiwJkyq9Mnm3i9husI9WYn/XlY3Crjo0Kmf2filkTGIGZjWbdzAdVLyT+3Th3Pyus9P2UVYb3+/XBVbfZ/NLdnAuxdAnkLLQjpewwz72JboD7hQaXuGFgQ6TFFn1ZIL63KTf3r20ePJHI3R0Tv08R4JZ2vHjclBLA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ltmHIPgBuDYTTRTajFurzGtCKm/fPy2Vp2CvOFAvBOqyzixob10Tr4eKUgH3+NdI+maTRhn4J9wpyyeECahYXnRZOBSV96i2nS/pynaQEPd1bJt4Z5wu2pP9HtaLeYo2R1m7kJW7oCXYrIMBn7rHI6SUEkB3GZNpsAli3e3MUF8uGau1zt+xK9YsOG+k+iZyfJnqlwBpJsAUMA7bc9gDboViUhBTy8BvBDxDJsX32vu1C9yi3p1i61kSWhfR5N4g5hRI6xNCbu1ix7jZUprc1d1ceHMg4FfizO4qWnZlesww+pAzkOa12vZo1cuYwOzQN8k8/lQVVETs+ZHFMjlbEhsxUeRJgCMO1b4y5IswNguzAIvNXO7RRGHjDOwB8jSvO6RFa8dSvC3eQvr88wZRLevP9qa3DRMBCyN5103qc2igcVJKSonhhd1FznBPkp2zyiXecUyykN1iM4IJTAAcdj7IK8z9nRp/Srr+qNuI+16egzcfGP4N/Yoyc46iAblw01QFJQNgGwoy59SZ1YVA3RbW2tV66nz0QppV4fO6Jm6pDaAlGK0/4HWAMuZ8dMCGba9NHUyK5vAwueFX+ukoAdAQ59u9/pQZu75iiqL5UvEFT3KlzB2JxhAlVArHX3zJCVi31Y1rtVZIQienbRocICxsDV6bVffpaGmvaIRN0eEnnAUjAmM48Zmp4dubAdqQwxBAtn+0GvMdhBnfFRliaAGIEtFqqTRycUh9Ad16XR6laFsNnDP2yP8zmSyvxW9/bQwcVV9SDkLKDXv9UxsCfqJn786k9AhfFbeb8+JwH0qkP6Y4MQWrVvvlCfcTIKFEBYBKeFt9u820LB5lVk+mf6Wydri1p++ECcoHH6acBgz0mXYhJK+eBI3kcJdkxE5GqWXbNcI7S9QixIxlTDCaxhxXpj/plCKARcGqRNGO52+lJFPhaZ7TfuYuGtHzTTEsDFxJcWNrBxMgyqqVKVG38Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b75eb19-54ed-492f-acce-08d9d9448a6f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 23:04:25.4932 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7704 Subject: [FFmpeg-devel] [PATCH 04/25] avformat/matroskaenc: Don't waste bytes on SimpleTags length fields X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TyuYLJOSWrd2 Also check the (user-provided) tags for being overlong; the earlier code had an implicit unchecked size_t->int conversion. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 15 ++++--- tests/ref/fate/matroska-dovi-write-config7 | 4 +- tests/ref/fate/matroska-flac-extradata-update | 4 +- tests/ref/fate/matroska-h264-remux | 4 +- .../fate/matroska-mastering-display-metadata | 4 +- tests/ref/fate/matroska-move-cues-to-front | 4 +- tests/ref/fate/matroska-qt-mode | 4 +- tests/ref/fate/matroska-vp8-alpha-remux | 4 +- tests/ref/fate/matroska-zero-length-block | 4 +- tests/ref/fate/rgb24-mkv | 4 +- tests/ref/fate/webm-dash-chapters | 4 +- tests/ref/lavf/mka | 4 +- tests/ref/lavf/mkv | 4 +- tests/ref/lavf/mkv_attachment | 4 +- tests/ref/seek/lavf-mkv | 44 +++++++++---------- 15 files changed, 56 insertions(+), 55 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 4ec2074d2c..154de25f59 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1753,10 +1753,11 @@ static int mkv_write_tracks(AVFormatContext *s) static int mkv_write_simpletag(AVIOContext *pb, const AVDictionaryEntry *t) { + EBML_WRITER(4); uint8_t *key = av_strdup(t->key); uint8_t *p = key; const uint8_t *lang = NULL; - ebml_master tag; + int ret; if (!key) return AVERROR(ENOMEM); @@ -1774,15 +1775,15 @@ static int mkv_write_simpletag(AVIOContext *pb, const AVDictionaryEntry *t) p++; } - tag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0); - put_ebml_string(pb, MATROSKA_ID_TAGNAME, key); + ebml_writer_open_master(&writer, MATROSKA_ID_SIMPLETAG); + ebml_writer_add_string(&writer, MATROSKA_ID_TAGNAME, key); if (lang) - put_ebml_string(pb, MATROSKA_ID_TAGLANG, lang); - put_ebml_string(pb, MATROSKA_ID_TAGSTRING, t->value); - end_ebml_master(pb, tag); + ebml_writer_add_string(&writer, MATROSKA_ID_TAGLANG, lang); + ebml_writer_add_string(&writer, MATROSKA_ID_TAGSTRING, t->value); + ret = ebml_writer_write(&writer, pb); av_freep(&key); - return 0; + return ret; } static int mkv_write_tag_targets(MatroskaMuxContext *mkv, AVIOContext **pb, diff --git a/tests/ref/fate/matroska-dovi-write-config7 b/tests/ref/fate/matroska-dovi-write-config7 index 1c1422c0e4..b652fe411d 100644 --- a/tests/ref/fate/matroska-dovi-write-config7 +++ b/tests/ref/fate/matroska-dovi-write-config7 @@ -1,5 +1,5 @@ -3fa1f47c5c3d22b5c33156ff14928d6c *tests/data/fate/matroska-dovi-write-config7.matroska -72758 tests/data/fate/matroska-dovi-write-config7.matroska +058e95f1effefe3842b6174bba2693fc *tests/data/fate/matroska-dovi-write-config7.matroska +72707 tests/data/fate/matroska-dovi-write-config7.matroska #extradata 0: 116, 0x2b8d1669 #extradata 1: 116, 0x2b8d1669 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-flac-extradata-update b/tests/ref/fate/matroska-flac-extradata-update index 1a8add7736..260d596904 100644 --- a/tests/ref/fate/matroska-flac-extradata-update +++ b/tests/ref/fate/matroska-flac-extradata-update @@ -1,5 +1,5 @@ -c2b76d47a9f0e9626a4999bd395cae08 *tests/data/fate/matroska-flac-extradata-update.matroska -2029 tests/data/fate/matroska-flac-extradata-update.matroska +56ff5763fd81ad3bc02c22402cd685e2 *tests/data/fate/matroska-flac-extradata-update.matroska +2008 tests/data/fate/matroska-flac-extradata-update.matroska #extradata 0: 34, 0x7acb09e7 #extradata 1: 34, 0x7acb09e7 #extradata 2: 34, 0x443402dd diff --git a/tests/ref/fate/matroska-h264-remux b/tests/ref/fate/matroska-h264-remux index b5ecebaf24..e55708ce37 100644 --- a/tests/ref/fate/matroska-h264-remux +++ b/tests/ref/fate/matroska-h264-remux @@ -1,5 +1,5 @@ -36fda8942bfed91fed04c5ba63dc8b1a *tests/data/fate/matroska-h264-remux.matroska -2036089 tests/data/fate/matroska-h264-remux.matroska +ae0ccd32cc0d3bfc1eaa15c7fc985dfb *tests/data/fate/matroska-h264-remux.matroska +2036075 tests/data/fate/matroska-h264-remux.matroska #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/matroska-mastering-display-metadata b/tests/ref/fate/matroska-mastering-display-metadata index 8f5d7b6a22..f13d60ff2f 100644 --- a/tests/ref/fate/matroska-mastering-display-metadata +++ b/tests/ref/fate/matroska-mastering-display-metadata @@ -1,5 +1,5 @@ -542ababe5c088ab925ee49373d8b8a85 *tests/data/fate/matroska-mastering-display-metadata.matroska -1669695 tests/data/fate/matroska-mastering-display-metadata.matroska +64403411e52d7ba9081ab5692e422737 *tests/data/fate/matroska-mastering-display-metadata.matroska +1669597 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/matroska-move-cues-to-front b/tests/ref/fate/matroska-move-cues-to-front index 46effff53e..55a03b8c10 100644 --- a/tests/ref/fate/matroska-move-cues-to-front +++ b/tests/ref/fate/matroska-move-cues-to-front @@ -1,5 +1,5 @@ -ce15d8b7577933a057c413af505500df *tests/data/fate/matroska-move-cues-to-front.matroska -23210310 tests/data/fate/matroska-move-cues-to-front.matroska +62064edeb4a621fd0097f04c410c165c *tests/data/fate/matroska-move-cues-to-front.matroska +23210303 tests/data/fate/matroska-move-cues-to-front.matroska #tb 0: 1/1000 #media_type 0: audio #codec_id 0: pcm_s24be diff --git a/tests/ref/fate/matroska-qt-mode b/tests/ref/fate/matroska-qt-mode index 9dc115cc0d..770d9e7e91 100644 --- a/tests/ref/fate/matroska-qt-mode +++ b/tests/ref/fate/matroska-qt-mode @@ -1,5 +1,5 @@ -a741bd63da27d6b8ce3a21009267703d *tests/data/fate/matroska-qt-mode.matroska -1884278 tests/data/fate/matroska-qt-mode.matroska +1e525172caec2bf4e191a68c97bbbc51 *tests/data/fate/matroska-qt-mode.matroska +1884243 tests/data/fate/matroska-qt-mode.matroska #extradata 0: 90, 0x817d0185 #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/fate/matroska-vp8-alpha-remux b/tests/ref/fate/matroska-vp8-alpha-remux index adb771df88..165c2404e7 100644 --- a/tests/ref/fate/matroska-vp8-alpha-remux +++ b/tests/ref/fate/matroska-vp8-alpha-remux @@ -1,5 +1,5 @@ -d06be833da8e8d9d00bf334e0dfe8a58 *tests/data/fate/matroska-vp8-alpha-remux.matroska -237192 tests/data/fate/matroska-vp8-alpha-remux.matroska +e3912762161bb6e7f9607c085b371676 *tests/data/fate/matroska-vp8-alpha-remux.matroska +237185 tests/data/fate/matroska-vp8-alpha-remux.matroska #tb 0: 1/1000 #media_type 0: video #codec_id 0: vp8 diff --git a/tests/ref/fate/matroska-zero-length-block b/tests/ref/fate/matroska-zero-length-block index e8c5decb39..924cec1e3f 100644 --- a/tests/ref/fate/matroska-zero-length-block +++ b/tests/ref/fate/matroska-zero-length-block @@ -1,5 +1,5 @@ -ba78b3e846d57002711bc481fa806717 *tests/data/fate/matroska-zero-length-block.matroska -643 tests/data/fate/matroska-zero-length-block.matroska +f37ba7e8a30eaa33c1fd0ef77447fb41 *tests/data/fate/matroska-zero-length-block.matroska +636 tests/data/fate/matroska-zero-length-block.matroska #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: subrip diff --git a/tests/ref/fate/rgb24-mkv b/tests/ref/fate/rgb24-mkv index 1ef70349b7..2630265ebc 100644 --- a/tests/ref/fate/rgb24-mkv +++ b/tests/ref/fate/rgb24-mkv @@ -1,5 +1,5 @@ -6244b8750d4155d3c9357bab26396ef9 *tests/data/fate/rgb24-mkv.matroska -58245 tests/data/fate/rgb24-mkv.matroska +2c7192d8b62c6a11e311a09ab3bef3b8 *tests/data/fate/rgb24-mkv.matroska +58224 tests/data/fate/rgb24-mkv.matroska #tb 0: 1/10 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/webm-dash-chapters b/tests/ref/fate/webm-dash-chapters index c04fc6a3ee..c2f87b2d7c 100644 --- a/tests/ref/fate/webm-dash-chapters +++ b/tests/ref/fate/webm-dash-chapters @@ -1,5 +1,5 @@ -c39ad75ef516d1d2e1332d960ad1057b *tests/data/fate/webm-dash-chapters.webm -111239 tests/data/fate/webm-dash-chapters.webm +d3a67db17fdca71b9f8cf57c341a031b *tests/data/fate/webm-dash-chapters.webm +111218 tests/data/fate/webm-dash-chapters.webm #extradata 0: 3469, 0xc6769ddc #tb 0: 1/1000 #media_type 0: audio diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka index 9c0ec88637..5d4ab243c0 100644 --- a/tests/ref/lavf/mka +++ b/tests/ref/lavf/mka @@ -1,3 +1,3 @@ -52d2c70afe0f9ac510819f723b5ceb3b *tests/data/lavf/lavf.mka -43583 tests/data/lavf/lavf.mka +036f852ae7ae18cf38ddc99ea39032fb *tests/data/lavf/lavf.mka +43576 tests/data/lavf/lavf.mka tests/data/lavf/lavf.mka CRC=0x3a1da17e diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 6e517efede..e737cdf6ac 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,3 +1,3 @@ -c1af29ab33c9477049672b62da221552 *tests/data/lavf/lavf.mkv -320438 tests/data/lavf/lavf.mkv +3e37e53471f20f2b7169afd75cba70d2 *tests/data/lavf/lavf.mkv +320424 tests/data/lavf/lavf.mkv tests/data/lavf/lavf.mkv CRC=0xec6c3c68 diff --git a/tests/ref/lavf/mkv_attachment b/tests/ref/lavf/mkv_attachment index 86ba4180cb..0149bf2010 100644 --- a/tests/ref/lavf/mkv_attachment +++ b/tests/ref/lavf/mkv_attachment @@ -1,3 +1,3 @@ -a669ae1a502ff0c487eee99753e7bef0 *tests/data/lavf/lavf.mkv_attachment -472593 tests/data/lavf/lavf.mkv_attachment +6a77b40186840d596bd584182ac3a283 *tests/data/lavf/lavf.mkv_attachment +472579 tests/data/lavf/lavf.mkv_attachment tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68 diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv index fc65b14cd0..37945246ab 100644 --- a/tests/ref/seek/lavf-mkv +++ b/tests/ref/seek/lavf-mkv @@ -1,48 +1,48 @@ -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 686 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 672 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292318 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292318 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837 ret:-1 st: 1 flags:0 ts: 2.577000 ret: 0 st: 1 flags:1 ts: 1.471000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320159 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320145 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146870 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146856 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153000 ret: 0 st: 0 flags:1 ts: 1.048000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292318 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834 ret: 0 st: 1 flags:0 ts:-0.058000 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 686 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 672 size: 208 ret: 0 st: 1 flags:1 ts: 2.836000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320159 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320145 size: 209 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146870 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146856 size: 27925 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292318 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834 ret:-1 st: 1 flags:0 ts: 1.307000 ret: 0 st: 1 flags:1 ts: 0.201000 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 686 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 672 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292318 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834 ret: 0 st: 0 flags:0 ts: 0.883000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292318 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292304 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837 ret:-1 st: 1 flags:0 ts: 2.672000 ret: 0 st: 1 flags:1 ts: 1.566000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320159 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320145 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146870 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146856 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 902 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 888 size: 27837