From patchwork Sun Apr 29 02:21:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 8689 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2187623jad; Sat, 28 Apr 2018 19:21:54 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp2BpMBixoXqFOtw8uhF2cm1Yyn3lO/K/7a5qeZgCUhdln5sNlKRHkqlvkQM1Ph1NrVHDlP X-Received: by 10.28.113.81 with SMTP id m78mr4507269wmc.150.1524968514632; Sat, 28 Apr 2018 19:21:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524968514; cv=none; d=google.com; s=arc-20160816; b=DFLlgM/5Rm1dLQnnQM9YeiUtEQ/aVKw7SWOp8L7mhM81VCThVCdhTkEaGuo2vPosU7 yPf0nmKcQjahZQSRUrpIH8HXcKZ1zpIe26GWDKXK90ZfSwW22pZklODdM9SADJRkuaqh x2OQa7AcxjO+laL5PGhLwhPvDzSdb5oH7G33y8RjE/9Qdk2BFbKz3ZNGrvzaMSeg+YX1 Hoj3N3ZEcvRO9TIiBtOxUopzfy3e3GNAxYxgSz695qTytvSQiNh9yp1bRi+wjt49KETl SczrdbTfTWB8pS7rPO2+rWNoGzeRI2L3PzCw5jDrO/XKg6Tz1LK046wWTsDjvolRVIYB TTEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=Z3n3gP9+1GJo3Wo40yOsACofZRq72Z3ZuDARvJhyd9U=; b=EIRWD3+t/RQC4KST8+W9p3AwJw88eGHUoZfXu1iOZMtuHTHDgzg1eS6Vk192kkqIiM LHyzDHPXFAokzu5A1zNZbIj6BRpvH/4aIAcH71YGL2uawiF7f5AK+UhKSfema8N3uGXv aaoY7ORYCgFfKusaFhsEekh3mzaquvcAQbDiPyS/RW4boBXcDRUTARqQ+k5WNiriloSJ UOkkgVbnNta4eoOxNCcK7hirLX5BViEO993dbsSmAKzYXC8AnoLYtUy+3G+ZBqGKSmP7 YJBV3X6YvxeYFyq6NJTX2lsefmy8ejN4IIcqpf+UGls+btmBRcar49VGQ/sBoL7jVM4G ndFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pMSJOFKq; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v7-v6si3987463wrv.129.2018.04.28.19.21.53; Sat, 28 Apr 2018 19:21:54 -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=@gmail.com header.s=20161025 header.b=pMSJOFKq; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6993268A54B; Sun, 29 Apr 2018 05:21:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BDAF68A4BC for ; Sun, 29 Apr 2018 05:21:14 +0300 (EEST) Received: by mail-qt0-f194.google.com with SMTP id h2-v6so7185243qtp.7 for ; Sat, 28 Apr 2018 19:21:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=tHeGRe9FO7sMlhJe0j3pCdVFA1ljTV9cAv07oDz3zaI=; b=pMSJOFKqMeLkk5yb+g7FJ5bLZpUK+0ALuGftRJGXoOLUZJyNg2wrtPtJgcT13l8UXf cQo/WlNZkmYHKOhXyTis9KbNDOY52R3krtmMshm1iV41FOPqV3ZvdkhFabKs0zTVqV4p wK3QeOwYlM7G0Z25wZHzkj+3EpQS9tDSjeBgblCpg4BXtFt4Ih8fIdIDg3eFATx9YEIP lltYVV9pf3/mylUT1VGu60e6UHcj8H/pzDRxoVj657zjPEK8e1g5A590RulAP7D0S8gP LtFebLBjl0ovVlWoOK006zNJqpx8up68VXFulixPo/j7YOUH3KTeZE4CB3RSRITGRplM Rbxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=tHeGRe9FO7sMlhJe0j3pCdVFA1ljTV9cAv07oDz3zaI=; b=oYwsDJJUyPLu56oBDL+CNPdQxWuECa4o3vL4rOxkjUye/YENGOJsJgTpEdMUMJQhLI 7wdS59psfmKd/047Ziq8/IhgXDlidDMX4t/bHPk/sKPEMTnPr3ikBYSmtAtyG7we937b ryTaHCNe9LRVm/SboPsFUuQzKwTTTDTA8rM9/0ged5nktlAGVBZmvuRe8fYGmlWIQN0J aRprNl1EU7N4CUrTh3ovKvdbeH7SlRAr7CTDBxVn3ISZq8Fpvuq6MfJVD01HDlp3P+GQ J3nzhcsXP2l9jHORJUosg3sE5qmR1WLkj0iharSojzJw9LVqPjyHM35jPc16nVZ4F+M1 FfzQ== X-Gm-Message-State: ALQs6tA/3sXsT8+cJjiPQE2sqhPOH21QaCeMIxD5HFg7z7wBZ0YuVThb uzhS+aCUadDa44eaVpOnqdyW0A== X-Received: by 2002:ac8:1752:: with SMTP id u18-v6mr5456381qtk.177.1524968504219; Sat, 28 Apr 2018 19:21:44 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id x49-v6sm4168862qth.18.2018.04.28.19.21.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Apr 2018 19:21:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Apr 2018 23:21:27 -0300 Message-Id: <20180429022127.352-1-jamrial@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg: fix mixed code and declarations X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- fftools/ffmpeg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index d3054092ba..9b3e9d121e 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -4727,8 +4727,7 @@ static int transcode(void) static BenchmarkTimeStamps get_benchmark_time_stamps(void) { - BenchmarkTimeStamps time_stamps; - time_stamps.real_usec = av_gettime_relative(); + BenchmarkTimeStamps time_stamps = { .real_usec = av_gettime_relative() }; #if HAVE_GETRUSAGE struct rusage rusage; @@ -4833,10 +4832,11 @@ int main(int argc, char **argv) if (transcode() < 0) exit_program(1); if (do_benchmark) { + int64_t utime, stime, rtime; current_time = get_benchmark_time_stamps(); - int64_t utime = current_time.user_usec - ti.user_usec; - int64_t stime = current_time.sys_usec - ti.sys_usec; - int64_t rtime = current_time.real_usec - ti.real_usec; + utime = current_time.user_usec - ti.user_usec; + stime = current_time.sys_usec - ti.sys_usec; + rtime = current_time.real_usec - ti.real_usec; av_log(NULL, AV_LOG_INFO, "bench: utime=%0.3fs stime=%0.3fs rtime=%0.3fs\n", utime / 1000000.0, stime / 1000000.0, rtime / 1000000.0);