From patchwork Sat Nov 20 12:46:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31514 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp3961453iob; Sat, 20 Nov 2021 04:47:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJwcdCJHKLJKKBV58PeS7FCTerqzSqQMBqVqEYD27HXQIdKotOL/4zLLdzm1LjzE+KWm0/dF X-Received: by 2002:a17:906:d20c:: with SMTP id w12mr17946830ejz.521.1637412440630; Sat, 20 Nov 2021 04:47:20 -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 sb3si8847644ejc.748.2021.11.20.04.47.19; Sat, 20 Nov 2021 04:47:20 -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=lNMbWkXt; 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 D8D9368A56A; Sat, 20 Nov 2021 14:47:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070094.outbound.protection.outlook.com [40.92.70.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7549687992 for ; Sat, 20 Nov 2021 14:47:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KeowfllP6J0Yqj1hqOkuHo0PByUKorQUcfwLSZKtr90cpVvPdZIMNEn1Jbj2IUkVOrWO9X/eTpDDH7KSthsrEoDgzSqH7aNudEmTrdgooKwBq1dbGfRvugBKF6cTi8YogvaQgh09DN+vlgKNTCtNzwz3uNLM47BEH0BtRMB3zxW1BJbwL2I6w/Rge37prU07HMj7Q//kfNYE9XevQRHb5Z0nM0dUSsXLlgF931xquPSWJ+PBiXEg7zKAz/MZqwAp+WBDdSfsoW3HBYk0uTss8OaO7WUuui7MCH7WkHznmD4i2OQzg5dkrXcO/avnj39EJJ3S9MSwWm7lwoyoXNd9MQ== 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=boeuqhhGuqwxWGw9eCROW8nYwaGF+ZAZBxSLvyjlz64=; b=W6LwHZzWIhu3ZMuC7LZFGOeZ8OjT1+YSyvnBv4maQ/0xYB01/KnLM2R/fVYF0w3btG3wZdtSN45hg0mSxZ+BFlGB+eaENZ8yT2pZKPX3ggn7Wxhv3dsLP+/kFj9cyB8j2ovx7mOsRhNd+oy9abjCA8q0dJA7616iNhBZNccPYUwOuSIBAMhA363RjNH5hZUnc7afB9t5HMOrIzH530qvEBoS4VmTr0swJuz8iLbTM/ZNm/W7DIUFGwW3+xuN4GiaGRLzFppV2M1iDl7+pZODqn8+Y+RuYmm/2jdo6d5ZLkdXMk4CS7lMCCL0aqZj6XBELtqBCFal5gqf6IptZpavUw== 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=boeuqhhGuqwxWGw9eCROW8nYwaGF+ZAZBxSLvyjlz64=; b=lNMbWkXtbkD2uhCufeEU2jhpqAaDitM0g6AWvefslihC4VUrloubh7+8+TWO4Zl+/Svir8ofhYq1SRRDhTHjpFVFDLlOpVlP7yUqRmQXIWlf+h6t0ZQQAIHm4+BVXPn1REE1kz6KxYVz6EuviXhw67469vhC6DpkAKyhVjcPqGpP0mkW4WKKPI10+Fe9LGxPtVr1VJ3tjP01bTVoWHlfYuthCWt9lhqZ7KFnMp2/vCcmrX24ys3a7TYvTp2lB+fbjkV1K4/dNQPZxBqL190QSU0DJ4eGTF0HfGOEe2O0QqnQmi/egv4Ywv8UHARuS+i/BE4cWhXKaNXjYIyEkGyXIA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5299.eurprd03.prod.outlook.com (2603:10a6:20b:c4::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Sat, 20 Nov 2021 12:47:07 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4713.022; Sat, 20 Nov 2021 12:47:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Nov 2021 13:46:58 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [1G1YOlO+uxIMGrjPqCeYotOD4VpBaAc4] X-ClientProxiedBy: AM3PR05CA0122.eurprd05.prod.outlook.com (2603:10a6:207:2::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211120124658.1351050-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.12) by AM3PR05CA0122.eurprd05.prod.outlook.com (2603:10a6:207:2::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Sat, 20 Nov 2021 12:47:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cf8936f3-417d-4f09-ac9c-08d9ac23dc10 X-MS-Exchange-SLBlob-MailProps: EpEO96k6Wol9fKQIkSXRM6aCPlv/tY+r4iiRnfWeWFxkebgtzAvu/K6lUyuUYgRdkihyEspKrG+pIdipRXtcuaeQMCCcCjLx3ZAZvzxd/EiCQf3nqpG5Ct3iL3X96xRmBghBqmxmKZW7xhLAm+VdBYTTzPeFXMftyfj7DzOUZzO5Eg0xq4TqpWSCv00NDsxjkm8JVabm5JqyYvIHGngpMtmrHft6dR/03CM3/tl3nH/8t/xrByOf+ONTEWrZgxAUF88Kw35v8tlGTWe+gOLIhRppo9ArETSSEi/E5OPJnEemHjHvYCVAauyGvANz2H1yTp+qzXvpKYBbisyIYlA4kOrgA2pYn7MXgM6bKjPC106wg2a+XVwpKmaTVYIgNgxGdcVbXXEFqvY9fENPA0KGIlESV9DE91ZvXL2vFyf/YD7K/Y/Nd/48mv9UTmpo1c1WukD9VzhlIoVxy6//oc7KUH1vJXRsB6AD2cuHhzLuss1f7HKou9S3bdgr8sMQKJkQ+B2yTVa5M/CXNlsLEBY71iot3bekumvkv9rvsi8BhRZvo0Y/rymT+dzZN69AYphN80sZf+yrqD0ELStCB7dlxc5qnR0rOVhUUr4uE8c+PIu8PzrQ1lXFuwZSem2Pry4ABOZLbLalK83eZIxvKWM69iwxkJGphjtmymr6E7ftGuI6DqC6zNpWtRmSKDjbFHJD1OKROZfEMyqzL59OK8Z55DAk8hjMWE8fdH0Hn4D3aZkDhaRS6Hf6NaobjYeK0mF7c5S8qmFwihI= X-MS-TrafficTypeDiagnostic: AM6PR03MB5299: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gIbKrQw04+QgowR/DP9u2Vkdyqj2YObUnS6q7CyZgQXYyaEV/yUWzgyjQ2F3LVubYGCwhJ9Gsxt0+Z8Dj0kgSFCe3+x7SU+d49y1JMUnbRIhKWVvyEOcbbmmkR+KZPMmuynII+gGqCCN0fwVzjkTd0rBrCJagGo/0kKiIe7REAHvbgDyfCxXNk8UOtYkP4Z+DjbsmovXJmjSpkotizVfbxctaiCxiXbgOIvTuZ5RGkPlK0DiEUhJtP9lco7BCb9vs1tDwRr71QAlxgPhwMfoOVURWrF1S+cICV/UKvhtlbC/CY7YW8m9qDb1nZrFpj2hVL5dBu//sbCar0ddDrMxSL8s1+rWjTYja0B3CBD92cOVGqKu1xM7xSImWyXta3UZNXfwLVkWuhCoWiQzau4cusn6oTxdfBuoadynTmUiHibH9W23Wv8CvwRJ93JPK+Qz28RnwOGDHXaPrQxNn4iXhqIbdOL9iKMOGiwbbXxJwdQp//IdNVyZsBJisgpEsSY3MzL9bVuUJLZ0LGGLguNZannzl1eawWG0z5Ow121nbmuLNCwZJrYpWNvTkaPh73POgSFHHMipCNt5VdooHaFJXw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6BNSN05WglqO1N50HH5hvrJGLiK+rymp3CdBwUQrYfFUcD+/jZnvi8J3wUmZfOsBNR8WRKABnZvOQuA87+n2mjxTjOzC6NcfzmLKMb+U5tjtJkk6Irm1u2nxRxhTBMOo+3oBGXcKrVU4k4LmJw2ql3gljbnuqsryoFrxbLZP8Se7nMHix3wQByjLoe4dvXYCAawvppxsp+8EVmHsCJpkdh93jfItro6OPMWCciWnDcfEq5g57fIepFfQ5k8VDbQ1iwv3ZWhCiIHgwMvPOjgL55/fcUQPuuRi213In0kHn678w4x+/oVuzCi1KttWMvhWqDY4ZkM7O+jHUzDPBgHi97WFUxW2YfizDIjrqZWvL0itKHEi36QfQ3kyQWB/nNf7atx8biSDKWgSI7DB0faPmzT1vbJcwcla/hvaXU6mvEkSiEgQmOnz76bw5HrJCRFVSlIVtll3aZsGITtA0t7ljbrsG2twfd1V3SqapPc8Shl+fA8NUVvwzh7e2ZhKiHsRGGxqiYpBt9nEAAp5Nl5RJL/cqDw0Q6kzYWrtAh6SXKzgHu4K/bHMi50weDEmMmNw1S1X5OKYbxwFm+L54+JE/zf36rlQO8gESQI5LyXqfqb3spbQQzaKwmDZcyVXzOM9kEnz5hmR9SbVmBueQErxTM/uhsrDLpkHErOZkI38qIAedhz0KDYqfiMSNbvD9gQh4e2B73QnWl01z0mWR2ySJA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf8936f3-417d-4f09-ac9c-08d9ac23dc10 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2021 12:47:06.8147 (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: AM6PR03MB5299 Subject: [FFmpeg-devel] [PATCH] avformat/cafdec: Avoid unnecessary avio_tell() calls 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: /JN/q2Tps0i7 Signed-off-by: Andreas Rheinhardt --- libavformat/cafdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index 3ff0558afe..4b5b15b58d 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -224,7 +224,7 @@ static int read_pakt_chunk(AVFormatContext *s, int64_t size) av_log(s, AV_LOG_ERROR, "error reading packet table\n"); return AVERROR_INVALIDDATA; } - avio_skip(pb, ccount + size - avio_tell(pb)); + avio_seek(pb, ccount + size, SEEK_SET); caf->num_bytes = pos; return 0; @@ -331,7 +331,7 @@ static int read_header(AVFormatContext *s) if (size > 0 && (pb->seekable & AVIO_SEEKABLE_NORMAL)) { if (pos > INT64_MAX - size) return AVERROR_INVALIDDATA; - avio_skip(pb, FFMAX(0, pos + size - avio_tell(pb))); + avio_seek(pb, pos + size, SEEK_SET); } }