From patchwork Thu Aug 5 05:14:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29256 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp81552ioh; Wed, 4 Aug 2021 22:15:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/EuHgOQz8ox+0ZCkqqYMnaBmfHWhUQMZSaLqP82XGcX9p3EsADqa9OvUz1J74eXRVdDEp X-Received: by 2002:aa7:d296:: with SMTP id w22mr4111748edq.170.1628140507296; Wed, 04 Aug 2021 22:15:07 -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 f23si4544442ejt.744.2021.08.04.22.15.06; Wed, 04 Aug 2021 22:15:07 -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=ULjXHHBR; 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 860D868798E; Thu, 5 Aug 2021 08:15:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067082.outbound.protection.outlook.com [40.92.67.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DD3768022F for ; Thu, 5 Aug 2021 08:14:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dnSarGsZuyA9MHhm84+VtJ9rT8CH/sTDUyNDUZhPH3CUClIfSYnI3ZtLo5a/7wMGLtBUd8K4OFl5k8EcIMDZBCRbO1cQve2eNA2C+Q/LQ1+OaDhRB6xTVl3KID4S3USpBVt+8v0KjyAp6mpMGHyrYNLx49itMOvoyNSW+MJfJEyJNciAp+rpskPtshtQ5NBjHw+K9Of2Cz7kWXYw6CYSECsm2Izk+EXIyteigxE1wf+3MeK7zasXZ6MTxbsZMJUSdyV5X4zFJhn48YEpoTbugWeFI4V902ZC7Rl8mlDvK4Na05Ka9ZiMJXVep7KTa+/qx2E5X93Jw+xQZTlSph3DzQ== 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-SenderADCheck; bh=mpp1LEFtiGjLXIj7nGuYerHTy/mOTIgkhISlOXhTpPM=; b=JqGcY1XrLp6yQjejMgC5F5b8nMK4xyNXR2kGQdTwRSC5Z4wWfbr0n0j9Dgzn92QqsTjeHNUNzp5znMEHJSwMe+VoVMLfH+8cX1ObBase/1tmTvaNfMw61hfe/YBEO0dMru2XtVa0WyCergaqIeFoLzZvqDPGtxGnJVNuXlUvsq3nCWltS6pNCBAxsPJtDLUO4XJLDkJKuEQ9SngVysf6YpzKeDlLtzqDQFei084HpZ3tKVFw+DJYsDDs0rYvoty7BqK6ZBGcYJv051OIQn7XjOAAzDArY14/4VBBDZDLZWCx/FySAA1ZSjFeRyDheOxGMyPuj2JmUmi4iXVHVT5/GQ== 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=mpp1LEFtiGjLXIj7nGuYerHTy/mOTIgkhISlOXhTpPM=; b=ULjXHHBRCKXc3GVgnNDc/s6/ALUAAutWt2fm8Xh79XwrGO+VFEt/B5EWqBzxO4eOvXna0lJ8i4V4gW1zMMKw5B+jtFf42SqmVV8DeWhByJTRcGPH6kbRGhCe5WWeoeUAR/f12/TeTuTNFKWrOdarrcGQJ5DwXGYUG08elWyISpob/l1NGgieyrEcObapOhK2TB9sHYBFK4YzIEZP9gWMESb9N+YQcflkhviJuH1Qv6weziykBjvRq8w01uWGQCuc6PTaDm3HK6lN6xoamvwrdMOMvejysWIaDswumGMZmCZ8HlPCTXQvdyVrMaR86bkECBHLFESJQVkljErBS8Y6mw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6888.eurprd03.prod.outlook.com (2603:10a6:20b:294::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18; Thu, 5 Aug 2021 05:14:54 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%8]) with mapi id 15.20.4373.026; Thu, 5 Aug 2021 05:14:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 07:14:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [NvYjY//TyH3EV5ZHSveX1JaljMpaWfUQ] X-ClientProxiedBy: AM0PR02CA0160.eurprd02.prod.outlook.com (2603:10a6:20b:28d::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210805051446.2094068-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM0PR02CA0160.eurprd02.prod.outlook.com (2603:10a6:20b:28d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Thu, 5 Aug 2021 05:14:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dedbc190-fb03-4632-e689-08d957cff551 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTzvpWxvWYRCiBlmWjUmirgJJSpaDxpOQzGxea2Sj9BZdO4l0Mf1+lmvdnFalnobqJt196yrGDcNGhY3DDICA3m1HZ/TyserowtD6xXlWZlvLdldLp4Gg9tFV/f+zWwbozIYRVE6vG7qigcPCXlNwjaWHyri3SK3/M3RP3Qj0eWiW6+aKXbMCUxofbHQsE5MtMXzYPczjrN1jElsq/4JhyqMgwM/oxsC0VPHYhEFtwY6NeDeSei+PNskGC8uhRIo6SKVx5x6INB1KGmSQ7chdsuu6aHL6X5UBkTKF1o+u68Cih8tOa2C3H6dpt8ZsScrzlM3T21Ap0qSEA8m7X/APpeyhxzB03Zju0dZQP4RH3RcPxj71c6TeNcZb4UarDBGJbnyS1aNaIMU9DITA4pGTKA4ixuwCTL7xsEGyp0Xq9aWDvq+jNFohPNWgjB0KpbOKEV+TVvbWSOCbpn9WtD2YUM2GJjIDhTxX9wvLyUQEPf/V5+bGaPEBiIRM6lCLFVklu9BR8usiVOj7NwNDldiH/rQ3f5/mK2f696tyDpFuviGuLR0YV6WE1HdLDGyN9ipL+rmX+QXCiufQdo6dxOXNW9X2VM+zXT5y+IQM8W+3/809RkWMLM1C98g7m3EIcDvsKck2EuXgZ9AT6twYyCaEsHzr+Y5MDn1FCOMO/hjIfJ4eTA+Qs2s1sKbTuKEDj2GwkCmH0NUGmrbdye/Z/L2Z2l+QyA3E7KuV6gsy48ByD7LwWWu2nw5ZiZp0qegHPUyy4= X-MS-TrafficTypeDiagnostic: AS8PR03MB6888: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2Z14dtxjv00AROGXsYxLtjn2+ycyQuoEYWqHRw8wgiL5SSIdEC6CYGMHUAAd2fUCnXQ5tuBEoTAfAuYcVOwqJxj5jz8iRB0lbZOii6XVgxBFlmS7Mq0nycaREO5kgqoXLVC3rSd4AjGf6ttTs72u64xFpje2THNkatjNYmc91g50mz6VZ/YU+uS8+qPio8EMe02q0mTa1gg6Sx/x6B3Ey4ljn+/TV+nmdaccvqVmjU3nJMVrcTHdfC2DSjBPiPfwGxZ7YlWNeeHiOIPsh2H+2kuXR10ViILdyQhmuAaY4lmy/numbEVG2LFNnOHN3nLVDkkqXuQaKGOPXVFhH1L+XONiJFCQgSje2xd9lwQeewLwhLkfK9LK1Ws9Ksf7HO50QXr+R6VmQQCcnrm2RKrM0J/he9fgI+Yl4a0C8aX5d312EKtFccWPp6rpTYAQwq0j X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lqkvRwAB6CzqLdZomZdKD4zTDij6MusJu5lerFiNLJvZ7dcVBNDgwDJZzldSYVCW2pJDrjlvbFXfvtHvOxyppy9sBJs5c2h54DV9AG6WVH/Y1Io7MpKi08X7FZIsxTfsxyJV4kQGPOuLxZEqYVlzBg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dedbc190-fb03-4632-e689-08d957cff551 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2021 05:14:54.0594 (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: AS8PR03MB6888 Subject: [FFmpeg-devel] [PATCH 1/9] avformat/aviobuf: Avoid calling function twice due to FFMAX() 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: kZWSGFmHq80U Signed-off-by: Andreas Rheinhardt --- libavformat/aviobuf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 66fddf1433..164b07ae6a 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -274,8 +274,10 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence) return AVERROR(EINVAL); short_seek = s->short_seek_threshold; - if (s->short_seek_get) - short_seek = FFMAX(s->short_seek_get(s->opaque), short_seek); + if (s->short_seek_get) { + int tmp = s->short_seek_get(s->opaque); + short_seek = FFMAX(tmp, short_seek); + } offset1 = offset - pos; // "offset1" is the relative offset from the beginning of s->buffer s->buf_ptr_max = FFMAX(s->buf_ptr_max, s->buf_ptr);