From patchwork Fri Aug 27 14:27:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29815 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1511964iov; Fri, 27 Aug 2021 07:27:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5NOLhzhQ+T6HH8wR32qyjTbJQo2PH4K6O5172nQkbg9/1U9QYAWQ+TgYgMMncNJIRPXR7 X-Received: by 2002:a17:906:700f:: with SMTP id n15mr10388402ejj.319.1630074478041; Fri, 27 Aug 2021 07:27:58 -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 h4si7513148edt.426.2021.08.27.07.27.57; Fri, 27 Aug 2021 07:27:58 -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="ryO5i/QX"; 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 E2FDC689EBD; Fri, 27 Aug 2021 17:27:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074075.outbound.protection.outlook.com [40.92.74.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91BC3680749 for ; Fri, 27 Aug 2021 17:27:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T1zws5ITyJ8Od9co8duJiSDVyBfPG5oGNoID9VKtobgM2e7870zhdH4hPN5KWZotuPD1i8JP52o7iNek8f2+EFH/Q/oCVNp++NqNbJLY5J7kPP+G6oXlsrYAtoarIC9eECjQCzHqZVEeHzUJzhWs8ZzMAG+Xyj4HwxbWCEeR2QLmsiSdWCk9BzzatvCi6J0qQqQuOeJ+6+5m+F5YPeHcYQsniw0IHJR8uzkybegKkVVT6M3kfIecQGYAtVGYP0LLfiNQPuMnrq3Djtoi/PuoGOKcarwWuTAswyWGf5QYEQpTYPCmuHzKi7gdjEYBv6stwkSiX9rqXNkTp1AzVd7Etw== 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=S/jXRY2FBkwT4iTbmQTArb409XCnppRnzvfDuwYNATA=; b=B3x6suGG7RdosWfx9QSySdzrcI0EZkSU9GL0eaH6xI0IStnuNmUS0JBBLueklZemVX0QEdahcgstCwZ7EAltmf3l0PZeZZNscX9vjWmcqyYSJ9UARALwT3ER8zPs2wkc2Lk0amGNjjy9vqbHzJDQgw1njbJfmfPx4roFylplIjqJni+Qo0nsSG4wAUDmYPtJ7BE8HcJYr4gP196CpiSi1FdDZFhqcN/wPRFPhZcGDUpfuFT69n8Jtryl18AB3nSTCb9dKDN7gTtt4BVwbiBWn81uDQDtsLOYHLlc8Za6fz6+cp5unouTbSsFZbXhY44tkpkbs2vNIWJCgMR4qH3nUw== 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=S/jXRY2FBkwT4iTbmQTArb409XCnppRnzvfDuwYNATA=; b=ryO5i/QX30gwWmkmGYW+4WSYVNX9WsG9WyA40yuvmOI8RBv0IdQ4fq9k9NR2HUPgd69kDKL68W2qY78hquu+ij1cZ8cxApNvdl5z+zfSlRI1WqDcXliO0zzenVIaS+VfHY+zNYZw1397IAF8/ZUzjm3D8KDvMlgCdflr1S6XaEbCoMBZeijgCb4ifzdAKBh4nrRHNtvAhZw1PsZTNTcwmUjFzut39DfzTzlpbZrWCAGsV4hJSxeM/jbd3pBydGnyh4lncyHEJY3dlw6/tTwDofHlf7mCG5ICCH+5et2j/YYvpdhCkebbWKP0E23b7huJVzW7djy4QJ+KDFnn8M8ZgQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3687.eurprd03.prod.outlook.com (2603:10a6:209:30::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Fri, 27 Aug 2021 14:27:37 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590%5]) with mapi id 15.20.4436.027; Fri, 27 Aug 2021 14:27:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Aug 2021 16:27:03 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [d13AYz7lNrFoXk0/DSxPt7R7sciJN2RZ] X-ClientProxiedBy: FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210827142725.645653-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.10 via Frontend Transport; Fri, 27 Aug 2021 14:27:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ca91fd7-7918-4861-b4f4-08d96966d16b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQnUOrjuXD0ZUxXZpiaS0/7xo2uLN93Y6ByCdpHKAKG1zGYFGP5JiU/ZIulfUYisXRdOjy3jUdYMO1F2NsVPiG7r8Zugz6OyNgb64UqSKVpLREFnQFt1CQhdNKIY55rsNy0Ey0QoHQobHURZDoTbWHYubE8xs1wOmcSZ60/UCiqhlKdSP2JeFmOFw3TiqVZ6nAbOVB483A+YIfHH2PZrGV70M8XIpFC5HibJOH7wlmNr1nyZQoQxJ5t+w8XM14GQ8/K8MOynLE22w2683K5rf8NzXcOVl7INcv+gN423ANgskcmyRmWaUgaR1tWGlRA9KFpnpldfDphDmrsXg/xG15Mvwto3pIymTSINCB0neN0ldrQOnjQPaBxae2EpAlKdS8Oa3aOduEbhSzFzLegg64WBgrdtSvecQQ8BE82fXyMNhcWvoNqu2lzd1ipS4NUzYdaWMqzLy9VA8nSQXYZMLh1Y6SnE0OQoWg784o7MGMaJ0iwvIq5BqAPZjYcPQODa4rReGpUgJCe7bMMYdhhfQOL7sqcAT02RIP1SLlLE1Xh4je5WaflZ+pQJeyG5gelwGRmPFuEM6/gwZnI42qUddbMrEzUcpLcLYeef+m7R3cZ9WF4iwKk6Tb1baJOSVtb85MxZDY60VpwJ6jjwfC+qKrdiy4OPWDtyL4uduI+qrU3Fn6hgfJ0i3KiBLn4Lk05djKeXMAu1//jn1fVTxr/nglZ/xzQh850wvuGhim9QUjGo2hFZTS8EO9tgtpe+6AaxUo= X-MS-TrafficTypeDiagnostic: AM6PR03MB3687: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EzAR+MzMt812LncMI02/nbEV/YbKuMz29J2r/0IEipKbfVi2hnWeYtir/3+WpOWHdcXMB1MNzwimws8/3Xuw0EVlpKPbS2Ttd6tBK1nNSv7zDw7ggUTgUau92hrPQ2wvNpbrr7Cvvm64f/ql4EQrZhhjlsTXRoQ90JXrp1Z9hl6w3lEro4hH0Ta8PwBzwP0wNXsjV5swsPkOBnDHlxLlgFuHl1icaxu2+0j1h5Uf6f3rhETlTgfjQbO4LmJ0FcYn3/Phcv6c6MS4PA3rr1WL+gYIzH107MJK2OG5kd/JN48WJQn85ylkibqz7Nxa5tKuq+nW3mU28zBkcjgPwfkA8DLzxYRMhS5bzau73g7KQAqzGH38Vk41YEnay9tTbG9N3V740UIM3eYpJJJtjWsEi4eeHXi+UWLQy/8Wt99BHKlV5m+8uQ6eWVhmQqmVuJbI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qo98e8wFEjfG63FfM4C72o0d3nwYDl3nwV/6He3D5RlVM7WA0n2Mj+F0WxVvoEzkeMOKke8ycXBsUwHWjkZwkpxjB30/Mbk9SubZ7+TDKzvqiKHvNmlD8dGvbVKr22dFFRhzAmUSwpx/1M6GIUEyCg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ca91fd7-7918-4861-b4f4-08d96966d16b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2021 14:27:37.3321 (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: AM6PR03MB3687 Subject: [FFmpeg-devel] [PATCH 03/25] avformat/yuv4mpegdec: Don't call avio_tell() twice 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: 4R4LASqDvv0t Signed-off-by: Andreas Rheinhardt --- libavformat/yuv4mpegdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/yuv4mpegdec.c b/libavformat/yuv4mpegdec.c index c327aa9d3f..69dd8a3165 100644 --- a/libavformat/yuv4mpegdec.c +++ b/libavformat/yuv4mpegdec.c @@ -44,6 +44,7 @@ static int yuv4_read_header(AVFormatContext *s) enum AVFieldOrder field_order = AV_FIELD_UNKNOWN; enum AVColorRange color_range = AVCOL_RANGE_UNSPECIFIED; AVStream *st; + int64_t data_offset; for (i = 0; i < MAX_YUV4_HEADER; i++) { header[i] = avio_r8(pb); @@ -254,9 +255,9 @@ static int yuv4_read_header(AVFormatContext *s) s->packet_size = av_image_get_buffer_size(st->codecpar->format, width, height, 1) + Y4M_FRAME_MAGIC_LEN; if ((int) s->packet_size < 0) return s->packet_size; - s->internal->data_offset = avio_tell(pb); + s->internal->data_offset = data_offset = avio_tell(pb); - st->duration = (avio_size(pb) - avio_tell(pb)) / s->packet_size; + st->duration = (avio_size(pb) - data_offset) / s->packet_size; return 0; }