shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix compile warnings for target=armv7-android-gcc"

--- a/tools_common.h

+++ b/tools_common.h

@@ -26,11 +26,21 @@

 /* MSVS uses _f{seek,tell}i64. */

 #define fseeko _fseeki64

 #define ftello _ftelli64

+typedef int64_t FileOffset;

 #elif defined(_WIN32)

 /* MinGW uses f{seek,tell}o64 for large files. */

 #define fseeko fseeko64

 #define ftello ftello64

-#endif /* _WIN32 */

+typedef off64_t FileOffset;

+#elif CONFIG_OS_SUPPORT

+typedef off_t FileOffset;

+/* Use 32-bit file operations in WebM file format when building ARM

+ * executables (.axf) with RVCT. */

+#else

+#define fseeko fseek

+#define ftello ftell

+typedef long FileOffset /* NOLINT */

+#endif /* CONFIG_OS_SUPPORT */

 #if CONFIG_OS_SUPPORT

 #if defined(_MSC_VER)

@@ -41,13 +51,6 @@

 #include <unistd.h> /* NOLINT */

 #endif              /* _MSC_VER */

 #endif              /* CONFIG_OS_SUPPORT */

-

-/* Use 32-bit file operations in WebM file format when building ARM

- * executables (.axf) with RVCT. */

-#if !CONFIG_OS_SUPPORT

-#define fseeko fseek

-#define ftello ftell

-#endif /* CONFIG_OS_SUPPORT */

 #define LITERALU64(hi, lo) ((((uint64_t)hi) << 32) | lo)

--- a/vpxenc.c

+++ b/vpxenc.c

@@ -1657,7 +1657,7 @@

   *got_data = 0;

   while ((pkt = vpx_codec_get_cx_data(&stream->encoder, &iter))) {

     static size_t fsize = 0;

-    static int64_t ivf_header_pos = 0;

+    static FileOffset ivf_header_pos = 0;

     switch (pkt->kind) {

       case VPX_CODEC_CX_FRAME_PKT:

@@ -1683,7 +1683,7 @@

             fsize += pkt->data.frame.sz;

             if (!(pkt->data.frame.flags & VPX_FRAME_IS_FRAGMENT)) {

-              const int64_t currpos = ftello(stream->file);

+              const FileOffset currpos = ftello(stream->file);

               fseeko(stream->file, ivf_header_pos, SEEK_SET);

               ivf_write_frame_size(stream->file, fsize);

               fseeko(stream->file, currpos, SEEK_SET);