commit f674157f6bc069ad56e924b54cd278c5f5ae4913
author Yushin Cho <ycho@mozilla.com> Tue Oct 24 20:07:46 2017 -0700
committer Yushin Cho <ycho@mozilla.com> Wed Oct 25 21:06:04 2017 +0000
tree 4c57f39f972061a306d3daac2654a4ba68075697
parent 058d088979b19f172e232b3602b1bdf9c019818c

Fix compile warnings with inspector

Change-Id: I055c0f23f4edf71cb01b72e573f0949e53f72dd1

av1/decoder/inspection.h

diff --git a/av1/decoder/inspection.h b/av1/decoder/inspection.h
index c2ffe90..67ddad7 100644
--- a/av1/decoder/inspection.h
+++ b/av1/decoder/inspection.h
@@ -20,7 +20,9 @@
 #include "av1/decoder/accounting.h"
 #endif
 
+#ifndef AOM_AOMDX_H_
 typedef void (*aom_inspect_cb)(void *decoder, void *data);
+#endif
 
 typedef struct insp_mv insp_mv;
 

examples/inspect.c

diff --git a/examples/inspect.c b/examples/inspect.c
index dafcad8..cb7e30b 100644
--- a/examples/inspect.c
+++ b/examples/inspect.c
@@ -332,7 +332,7 @@
       *(buf++) = ',';
     }
   }
-  return buf - buffer;
+  return (int)(buf - buffer);
 }
 
 int put_reference_frame(char *buffer) {
@@ -370,7 +370,7 @@
     if (r < mi_rows - 1) *(buf++) = ',';
   }
   buf += put_str(buf, "],\n");
-  return buf - buffer;
+  return (int)(buf - buffer);
 }
 
 int put_motion_vectors(char *buffer) {
@@ -409,7 +409,7 @@
     if (r < mi_rows - 1) *(buf++) = ',';
   }
   buf += put_str(buf, "],\n");
-  return buf - buffer;
+  return (int)(buf - buffer);
 }
 
 int put_block_info(char *buffer, const map_entry *map, const char *name,
@@ -449,7 +449,7 @@
     if (r < mi_rows - 1) *(buf++) = ',';
   }
   buf += put_str(buf, "],\n");
-  return buf - buffer;
+  return (int)(buf - buffer);
 }
 
 #if CONFIG_ACCOUNTING
@@ -489,7 +489,7 @@
     if (i < num_syms - 1) *(buf++) = ',';
   }
   buf += put_str(buf, "],\n");
-  return buf - buffer;
+  return (int)(buf - buffer);
 }
 #endif