Merge pull request #258 from TimothyGu/emerg

Fix libnut/ffmpeg compilation on i686-pc-mingw32
This commit is contained in:
Tony Theodore 2013-10-15 03:30:47 -07:00
commit 928c3a7c4a
2 changed files with 16 additions and 1 deletions

View File

@ -0,0 +1,15 @@
diff --git a/libnut/priv.h b/libnut/priv.h
index 5183503..aac2952 100644
--- a/libnut/priv.h
+++ b/libnut/priv.h
@@ -44,6 +44,10 @@
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#define ABS(a) ((a) > 0 ? (a) : -(a))
+#if (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR))
+#define ftello(a) (off_t)(_ftelli64(a))
+#endif
+
typedef struct {
nut_input_stream_tt isc;
int is_mem;

View File

@ -4,7 +4,7 @@
PKG := libvpx
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.2.0
$(PKG)_CHECKSUM := e968e090898cc3a0aef3e3d9c3717e2d696010c8
$(PKG)_CHECKSUM := 214d9a215af1a3278d9fcba4cac89566e321e4cf
$(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://webm.googlecode.com/files/$($(PKG)_FILE)