[FFmpeg-devel] fftools/ffmpeg: fix mixed code and declarations

Submitted by James Almer on April 29, 2018, 11:09 p.m.

Details

Message ID 20180429230940.3604-1-jamrial@gmail.com
State New
Headers show

Commit Message

James Almer April 29, 2018, 11:09 p.m.
Signed-off-by: James Almer <jamrial@gmail.com>
---
 fftools/ffmpeg.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Michael Niedermayer April 30, 2018, 3:53 p.m.
On Sun, Apr 29, 2018 at 08:09:40PM -0300, James Almer wrote:
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  fftools/ffmpeg.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

LGTM

thx

[...]
James Almer April 30, 2018, 9:28 p.m.
On 4/30/2018 12:53 PM, Michael Niedermayer wrote:
> On Sun, Apr 29, 2018 at 08:09:40PM -0300, James Almer wrote:
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>  fftools/ffmpeg.c | 10 +++++-----
>>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> LGTM
> 
> thx

Pushed.

Patch hide | download patch | download mbox

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index d3054092ba..4be6e46d9b 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 = { 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);