From patchwork Sat Mar 23 02:06:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47355 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp285950pzb; Fri, 22 Mar 2024 19:07:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWwNJDU1zhef5B8MRbEbIt6AmqYXylFlg0gy7ltx9QenVYpKpUbhF86tU5/cS1JqPG7XiUr69swPtcvx8dEHrC/O+1DREOTEHTcjw== X-Google-Smtp-Source: AGHT+IFXN+Lz/UgffRbKNiZL3w7V9AlIuLIvjM3slX+uwSCGV6DRqnbk23QZpZ+FkTy+eJVNWi5i X-Received: by 2002:a50:bb0c:0:b0:56b:eb92:3d with SMTP id y12-20020a50bb0c000000b0056beb92003dmr641171ede.3.1711159647133; Fri, 22 Mar 2024 19:07:27 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q4-20020a056402248400b005689f540351si399849eda.140.2024.03.22.19.07.26; Fri, 22 Mar 2024 19:07:27 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="YNZp/j7l"; 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 580AB68D5F1; Sat, 23 Mar 2024 04:06:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2050.outbound.protection.outlook.com [40.92.74.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9602168D5CB for ; Sat, 23 Mar 2024 04:06:53 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A8QFIw7R8d7cCxqQ6xzn8UhPjXIJ08rLgUfVVdtGZDNx3AUzwaK6YngG7BxQw04CynedONVIFcg1IAMEZXpF9dgraqGKrumaVCXwSn0KgtjCNc7nfMYrPn6E09yL9XDHyVmWZdIOr22qszaNlikYjFhqIwmlHYVcmFXKc4TdGRb2EodN22HIq+FpBMtesMKU/ku5FXCTW/vxwdynO9Gpr1xD0t5I4ELgnzqHT+8pw9qpLBeRMWwA/KJiAPc/KzKknjMvLzPjfBWTt7c3Z4CvdU7FzJblaF+ONgBLP8k5gpxZVZEr6j8FemNEKBtG0CPCWgHog0SeiovOQ3UNXkLZ7Q== 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=NLlufkZ92CQEM+oXOUG9ELpL6OjGUDNPCTt7XVd2Wxs=; b=XACB43z+Iu4WL3r9oMbNA2lyh7YMtXr6VRJL6CgpZlQVoB/hW8URKOZeUok7mLRzesZK0RCb8GQRZduA1nTEQwMr0R8+GShB0qQEG5ycZOLq8rdrK8kcezzqXejub9yh0xUMZwTKY5+spGhrRvVZL9FiP5omjGgJ46yTDKV8lHq47KkJzq6rzDvoUjcrSUGgAYl7eOIwA5p3DkfCNLHKMUIrW9BwLUq/5eshtp6K77FUkuQ0HdkGBBpaSBGyBTAxVB5M8b5JeObojvg2cjY87Clgft5vQtN3fXWG3RrB3n3Bzn/3rn8EfIAwe5X4RPDGMJy3DE4oWemYdQQCdsYztw== 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=NLlufkZ92CQEM+oXOUG9ELpL6OjGUDNPCTt7XVd2Wxs=; b=YNZp/j7lLXYRBUN6JeWQ8lLHlQZDfU5LjDO+uHgRiLcIw6afvfRnpp281nCjwTLWI8C40+OGCTl96nPSQECoYhQ/pPENeXDg+ROkuhjRdzOu9vAVdLd7yc9G4vXbSMRXOr8q8EqqHPqcYpKjPdlyWasmbbDA3Hnx7BrKQL3FEcFgC77kGaNThOHCdbCW1MGdBFW37k56+08Nh9wcX+aZ+tAm9aOJ5WueReCMQGZV276AhN0oYcXrBreLiy4BExsAHvXi+1mbDhPxfOaA8kD9DDTqsffHQeJDqAnl8Dho8qpyxvlzs8/Gp9OhohxXWI4J+DeoIy9XCOSOA0ZDnkJ++w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0137.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:320::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.24; Sat, 23 Mar 2024 02:06:39 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7386.025; Sat, 23 Mar 2024 02:06:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 03:06:16 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [FfnI7q59yTLZZuOX7dIrUViOrZiL5fKqPkWRy4WQAMk=] X-ClientProxiedBy: ZR0P278CA0005.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240323020623.1570961-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0137:EE_ X-MS-Office365-Filtering-Correlation-Id: e89a5a9e-2473-4bbf-41fa-08dc4adde036 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqkjmXb1vlddM5aSa/Epk3A0iv0vEUyLYw3CKWHzxECklSRfqpaV1vB3YAbcMP+CU7co8v+Skn2DSW2w2aYWNh6O0Dxs6ABzvT/AFsa2JhcwSOdrrLrA0f4A8v7GQ96+WbBJ4FUPfCba8oN3Pp76nJSK4KApnwSiTdf8c/nP3zDojJgqUBMqxDtmizCvbYUGDfJWafnTPTLV3KApnkMN4oBhfedIX8XsVwKGmqSaWVfx+ekU4sXTujh3qgmUC77cORvbc+0S21KeG3XqpZTuz/xxFDOoLcDXwXs/SGcWqitrDAbkdmP0yomAC3IK2qGJcbNf9R5zdVjYd7fL4WHtCqXjLB/xBukIcZm73ZDowEN1HHLibkTR22GJRIatgcOW3iEwyH7gEr/kCJrEPSZu/M5w45vGtBziApgAGXe3EeMazHrXYMDHNPNG7ZuIwb1AAY/mDm4kob9XCUZX/zk82ILW59hrhp9hJBbZ5yN1FTSLiZvtcA3pvGuG3xP9RptewIZ+qKxTCw5LT1PLKlwZ0+0to641CfghwH7rqLT8/dJR2eHltWtoDWRw3EhPEJKP7swB6xlkO8saphT+gmU+PscuUAqxohp3T76geJn4+Y6dPMU12bLtWz/ueaOTEx7UrhOR3YrQDaVBWsOKR+Ij/iKXwuKog66E13a5BhqWXm0qn6qU9cZUuu5JmMpS+6bDiXJponaJ4ZVsDCn+dzdvePvoMAuU1vFY+1gQDAolB+ENSjo6dY2TQ+Y/bzXDDR2RDs= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AljAu7h4LRFxCahyywoU8WAjNHvTrUsuqG0bWo+ZfBjtYl8I/A0n6aInDuJHVYkOdDM1xyP3WqXNKQatjJxENBtYVYssDTvN6dMq964xaP9otfdDJaJbAWrvwKPOv25D48d7p+kAsfBjW4kd6BAcFWXHzXLmqJV37MTx2mU7mVzoHu2V6/idMotvNYAaXFTFCWEAt3msjvZtSCRlSOyChywH9CX7pm6iiTMKu48MkT9fVxKYc669F4Pv22Occj7kxsZOLOw9+8bOl9LRQs5xIThb0X1+jkaT/KgX5fJc4aMLVzaJjKi2nb93e0le85ySxqNL5cpjXo4CP7V/nvD/YM4Si28/kQAD4hNs1oU7q5sdfiOXPrSGOFYpKmYh/raJfdmLuPJL9WuNGkqImQ6q7xDs9Cr8TuPaqXc7c+rR7hSQ3VHKUsnsaCSsnW1D/SQKNoejj/cijz38rSF4vxErzCb2S2QXgKhuTeejfz3mv+i2bI3VG93J7jtxZPho2d3YUK86Yk5rEKCoF+f9Iu+vQHSyRzGmEg7yLb5I0HrxhxBoafULAUuy2CkdxbMW1j9TuDcuneVOuOu4OiZugLJf1DDIih3ThGT9zyt6d16UknI= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J4xPqtCFEIWnwj+PJa2wzeh8U8ogumJ4aTp0rVw31GI6CwD/KP5s+IcN2t6rJ9Gzz837DkhoE704mUUbgzyKQlHfslGHfxHNMR5kMQxBJBNyywkaDyurRLyI0fVmAHmzHYDl9FL7B3Dk9w+NkHE13kk+14A2xXY6GsjbnKsIAH+9wXcom3G1oLFKreboAM2zZz+JXCAN1tyriEemynYy+t/55nZ6H/4xwSOE2za7Qx7+qn4b6QDFlEDUdBstDO1NPTfp3aP8CcKbs7lboNyuBU7BgvZQDkKemHTIrHYMGkOaTfmf3A/CZRMsPWA2TP5aLkw6so7dKNtH9mQ+clLjs6kBdJ5rDtypyzpBlB33ese+b4AzL56tqAqxQnRvR0LcyZYGwtJy0hq9QZ/7PSGyWdMtBh0UUyPmuu4ad8n97zjF8Zvp8R9wi5sxkt4xTyRvnmbJh002K/Whyr40A9gKQUecIBKfp9EiNiwxnnsgv9uXGgtNmNMheSeLYtNqkOZiNjl42etRIf7xLWNgOmDs1ch42tiITqdLSi0EeEGqtrbhIrB6ZTMmOSw98HZKtvzozwoPCW925uEsy8WisCiKHM6I7YQ7/Ge9BQyaWXFPL4lA73kWlWZJVZF8UWjAYd2O6YsnQ1C6hnNLX9on5nx0zAKSACliqmH8BzP5rYvhf9RjJe9lbFY9QStPLJIKNRhg+DAWtXmuE94FfR6gwf5gAxQwMniwYK89U3dmp94YImhm3+yfM2PYjhKx+k+tp3S8PU+tVNGzSfWseK/byopseW/zoFZx8Brl5bxv7PPIozJ95IF0xRgAG+6qWeE2chkzD5QuGNytq3nHZvELH8Bd2mxhqjEvtnGeoQCwKqPG15RPlkRW0HGWNf+H+CXKCmKVaf7Sloys/zMi/Ak8ZnFfmJxawuEczvobudav/6bZZc4fBfsLPXd4XW+7jVeYkqc94oAPXdnJEaJX+Lanj0H35DUBrG/2x1IwSjnDdRGriaBEi4AWZc5Lok7AsG91JKyaXV5lrG0n60sKf2Nv3JvP+i73QiXIw9ZiBh5/kxGQFGZ4ocCyo3Evpk8tinS8HwWmcGJbH34y3921isGrAQPMTjs+tBuJyLzZubJD5FQ0N4qIVN3xMGeAQVp3Z2Z2d2tL213jnAYbd1gdeJgmfS1XvOCuQjoXAc6XXf6ieCc3xnzcTaikDISAjjs9PUjPhR0HYJKBMeXysqOKmn5e2cIUF2j3Ylg+fOo78ZHFOGxDsd6Kgjcnf6DBOw4QoBMhfz3/2ai0eM5IVtiinIi70/4KuA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e89a5a9e-2473-4bbf-41fa-08dc4adde036 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2024 02:06:39.2053 (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: AM8P250MB0137 Subject: [FFmpeg-devel] [PATCH 08/15] avformat/wady: Combine skips 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: 90fdOMjK7EHt Signed-off-by: Andreas Rheinhardt --- libavformat/wady.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/wady.c b/libavformat/wady.c index 6dcc0018f3..17b7a88c19 100644 --- a/libavformat/wady.c +++ b/libavformat/wady.c @@ -45,13 +45,12 @@ static int wady_read_header(AVFormatContext *s) int channels, ret; AVStream *st; - avio_skip(pb, 4); + avio_skip(pb, 4 + 1); st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); - avio_skip(pb, 1); par = st->codecpar; par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_id = AV_CODEC_ID_WADY_DPCM;