shithub: libvpx

--- a/vpxenc.c

+++ b/vpxenc.c

@@ -27,6 +27,7 @@

 #include "third_party/libyuv/include/libyuv/scale.h"

 #include "./args.h"

 #include "./ivfenc.h"

+#include "./tools_common.h"

 #if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER

 #include "vpx/vp8cx.h"

@@ -35,7 +36,7 @@

 #include "vpx/vp8dx.h"

 #endif

-#include "./tools_common.h"

+#include "vpx/vpx_integer.h"

 #include "vpx_ports/mem_ops.h"

 #include "vpx_ports/vpx_timer.h"

 #include "./rate_hist.h"

@@ -1352,7 +1353,7 @@

 #if CONFIG_DECODERS

         if (global->test_decode != TEST_DECODE_OFF && !stream->mismatch_seen) {

           vpx_codec_decode(&stream->decoder, pkt->data.frame.buf,

-                           pkt->data.frame.sz, NULL, 0);

+                           (unsigned int)pkt->data.frame.sz, NULL, 0);

           if (stream->decoder.err) {

             warn_or_exit_on_error(&stream->decoder,

                                   global->test_decode == TEST_DECODE_FATAL,

@@ -1475,7 +1476,9 @@

 static void print_time(const char *label, int64_t etl) {

-  int hours, mins, secs;

+  int64_t hours;

+  int64_t mins;

+  int64_t secs;

   if (etl >= 0) {

     hours = etl / 3600;

@@ -1484,7 +1487,7 @@

     etl -= mins * 60;

     secs = etl;

-    fprintf(stderr, "[%3s %2d:%02d:%02d] ",

+    fprintf(stderr, "[%3s %2"PRId64":%02"PRId64": % 02"PRId64"] ",

             label, hours, mins, secs);

   } else {

     fprintf(stderr, "[%3s  unknown] ", label);

@@ -1688,7 +1691,7 @@

           int64_t rate;

           if (global.limit) {

-            int frame_in_lagged = (seen_frames - lagged_count) * 1000;

+            off_t frame_in_lagged = (seen_frames - lagged_count) * 1000;

             rate = cx_time ? frame_in_lagged * (int64_t)1000000 / cx_time : 0;

             remaining = 1000 * (global.limit - global.skip_frames