From patchwork Sat Jul 17 21:34:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28955 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3030518ios; Sat, 17 Jul 2021 14:34:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzum8C/1rmHxkjTjnJad5XVvXOKiaPfrEd/j5ywUivpHbdZkPRJS65ze5mYr4gs/ZOSY3hO X-Received: by 2002:a17:906:2bd9:: with SMTP id n25mr19547930ejg.513.1626557695146; Sat, 17 Jul 2021 14:34:55 -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 b8si7042393ede.407.2021.07.17.14.34.54; Sat, 17 Jul 2021 14:34:55 -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=CxFmQVJ9; 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 2034E68A817; Sun, 18 Jul 2021 00:34:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072087.outbound.protection.outlook.com [40.92.72.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 238E368A380 for ; Sun, 18 Jul 2021 00:34:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UmQhua0bH8wXPySUQN4iajd4rrzmnudUv36ZV4dDo/qp96kzbyGw1EL+RoXRXdliySiSuCVJjU6i20HkOzFUP3xDSUnRAGSF9g4/IdBcEdtxRucKZEbRK0JaHbmVe+agMaNiSzr9GGuv0CvJHH0nlCifgIXqj7pm1phMrlrp+6Q8Y3yqSrycxjev+nDVr+omA16iIS2OcfXmcGvfYDpujaT4NBUdZxn0EihKtHFeknalZZzNcafSJC+4dzxNJph3qjpEKyQ36ch3XLilhzeu1j2ja+47o8dHnLOHDKXfO5GD9383b0KIsHGMwFYV3yfh2g6crMytUetteTyTESAGog== 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=o6UdccUOGIIn2H0MQ+atJHK8AzxeDbw81e0QTmgREXk=; b=fCw5ZFA70f9SCGJ0o9g/Qrz5DCe3DUSHFRjdkzM7Uqa2dy2s9kvHy+Ud7oXPmuveYDwDFao49Fvln1nyhGwBJwsJ3XUdySpAAAfUFM0kSBhz13i8B88kgnVCWFloCZoipuQih54zWua2yyNt7E3QPmkp80h2CXO+rOOXup1jHWRWU6oQTTnHR6F4l9J6rvOnaqt1L5CGqtrnsyFYvcR8CCEMHfwcWpalIdZ3yh2aHXEAUYWMZelEAdEsxOFb7tC+wHqKGxmOBV2D9VJAGqYs5XKg5ETD8m5fFmgpFKX/qmv8FOngfkGHKjSRv3F1ECaCgMSA31Wg+kO1W+KKKOCavQ== 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=o6UdccUOGIIn2H0MQ+atJHK8AzxeDbw81e0QTmgREXk=; b=CxFmQVJ9QuwxEL15GtgClSIVBEJgTGiaYCEKos/042ujvlMfBFEWr0FjL76elIFSbO0YAU6bo6hPQWt7bfTbXkhX39SILr7c3yJ9GJeyc3anCWL1yTpRYJrTRhjpxZUw5KFzXQ74UI9npLQugR3OA60OF4jgKxnTizJS6F0PSq5OU5pfb9kyM4xne+0O8dnQBl/02oQZSHUfPoAUqz4rAi9vp78Ia7eEFRkk8KbDnQRkr2V03FfgN6F7d3zOKz1COpJ1IAeSWJsm0JEir0QpykqQOTfydFcEiBG8mE7J7tCo5qwq5Ksyu1cvPDpCN/4g5WrAf9kvfV902vWNl2E8dw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4453.eurprd03.prod.outlook.com (2603:10a6:20b:10::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.25; Sat, 17 Jul 2021 21:34:41 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%7]) with mapi id 15.20.4331.029; Sat, 17 Jul 2021 21:34:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Jul 2021 23:34:33 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [Gy5WOw3iSHuMAkFKAObcx2njILSlK6An] X-ClientProxiedBy: PR2P264CA0039.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101:1::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210717213433.17230-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by PR2P264CA0039.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101:1::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21 via Frontend Transport; Sat, 17 Jul 2021 21:34:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7fc3d7f8-e6aa-4a2d-0df4-08d9496aafd7 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIkkbbhc/R5YBkii7SCWNYsXBI+X0QQLl8gFzNLyhZWvN1/YnN/OvjM5ldoQ1LDnAlOORqdjAJnX5GuggT6IRMoRIfrGaNsK9B2zP+4OFNfSTWRYlDRjuBNC99FIrRS5xfrE+kmgACbyaRl+DGIFI3QaTVh7SE6Sz49THsXtVvULv7aLCcdFwSfIZ6vVAEqbaPb7qnrM9K495LwEZZbyFbjrzipPsGsSYeG01Drpj4RSVlJ1aJIEQEv0b2uE39avGz9b4ik+ciWwlfYno1aexA9JkYR3N6Xx1KYEwg3fs9iUEIrn+Iu33XSMYYMmFlPnJol/V1RMYdYvJj5iS5Ld3GBY0ZraXtPjoC7qOb688ctRwhoWYigX6n1tUUDeLagOQj7QuTh4U3cZMujnLHDoXxJcUsLK/za0sHdTAFVMONxEu9+QF8O3/KrtTge7Yva0pNphdnTl0eE6tcMAm3fmoNggEr0Fta1wh0Il5b+WQG77K/YMtB11pbs1EFFywhAIrKonG3dI+454RhOY9XKuRfbDSww5t+7jpOKaYNb4vgYJMcGwVMv5boMBC32ma8zV6kRZEnbo7CDcYpAd47LnOFehLfIch9Id11gb654nVhWglfkaLMB2QIx9tTCV/hn9j9bRRwlVqEq0bOGsxWc4HgVNahYeCghIIlTI33iLz00ulLro70RjfK/nT5GI2UsR9rhYGdZnzTjVA== X-MS-TrafficTypeDiagnostic: AM6PR03MB4453: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kSn9AFCf/FpyKiTvPZmbHN9GD2fBjiOQfXmzmENcv1BpgvtwV1os1sVw/lAXza1S0+VSDeuxvVYwkBF0x8wCDKrA4mWyuMkfsLGexEavUV5WWiwHUEsjIEVPpG9gDUwdyxFhPYnl0y++T11yn3F0vLPkemFaKEPTI7nWSps8gjWVDYnMyl2HYyrk4/EWdF8XRhhNnhHoZI7MnrpQ1fkbS7u8c86yeAkPvooMubS/RqPFcttKpEn8GSYqZjM5TWfuRTHgE8NJ8pDjw6SI1ghpfXS40dpnrKAllFHKH9/bZuBaL+K2HzjBzCgXH//L4InGv6Zu7LcyHZ8vPfOQRWiW689b8M8B1l08lDWRrP5nLpxYptP1F73P03yHq2mMjaUdiy2bTibFPNaMmisEsVma1HMXF96JILUtXa68gUbUcvHMVlPI5Xuss1YfLs99oA0R X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: idDqwYYvx0B6hgI3ZGWctEKcBr6lJpY4dVcxSAiG0KVUtB0G4EuQbls9V1Q0waQyNuCW2paSv0/fsFVIs3xHv/+LxmdpKId3vui6sb/N2Fy7QqVGB3PJITvQAvJSQO280DJk9oM5cyDAGPqCRqD40w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fc3d7f8-e6aa-4a2d-0df4-08d9496aafd7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2021 21:34:41.7572 (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: AM6PR03MB4453 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg: Fix declaration-after-statement warning 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: Qqamh6JmxK26 Signed-off-by: Andreas Rheinhardt --- What is actually the reason that we stick to this C90 rule? Is it because of compability with ancient compilers? (Given that we already require several C99 features, I doubt that there are compilers which would fail if we stopped adhering to the declaration-before-statement rule.) Or is it because it is presumed that it improves clarity and readability? fftools/ffmpeg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index e0f2fe138f..6f6e002604 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -4234,10 +4234,11 @@ static int get_input_packet(InputFile *f, AVPacket **pkt) float scale = f->rate_emu ? 1.0 : f->readrate; for (i = 0; i < f->nb_streams; i++) { InputStream *ist = input_streams[f->ist_index + i]; + int64_t stream_ts_offset, pts, now; if (!ist->nb_packets) continue; - int64_t stream_ts_offset = FFMAX(ist->first_dts != AV_NOPTS_VALUE ? ist->first_dts : 0, file_start); - int64_t pts = av_rescale(ist->dts, 1000000, AV_TIME_BASE); - int64_t now = (av_gettime_relative() - ist->start)*scale + stream_ts_offset; + stream_ts_offset = FFMAX(ist->first_dts != AV_NOPTS_VALUE ? ist->first_dts : 0, file_start); + pts = av_rescale(ist->dts, 1000000, AV_TIME_BASE); + now = (av_gettime_relative() - ist->start) * scale + stream_ts_offset; if (pts > now) return AVERROR(EAGAIN); }