diff options
| author | Sebastien Vincent <seb@jitsi.org> | 2010-01-23 09:28:11 +0000 |
|---|---|---|
| committer | Sebastien Vincent <seb@jitsi.org> | 2010-01-23 09:28:11 +0000 |
| commit | 12073a2e03e330c694a47faa900120cc89c0d854 (patch) | |
| tree | c8041d69f09dfa6bac356ac0c6ff6f6c8d3fd8d0 | |
| parent | 49cc018e3c595bf57b20365c24bce69a35c4338a (diff) | |
| download | jitsi-12073a2e03e330c694a47faa900120cc89c0d854.zip jitsi-12073a2e03e330c694a47faa900120cc89c0d854.tar.gz jitsi-12073a2e03e330c694a47faa900120cc89c0d854.tar.bz2 | |
Add updated ffmpeg JNI library for Windows (32-bit and 64-bit) and Mac OS X (universal binary i386, x86_64, ppc). It need to add Linux 32-bit and 64-bit binaries.
| -rwxr-xr-x | lib/native/mac/libffmpeg.jnilib | bin | 5809872 -> 5826256 bytes | |||
| -rw-r--r-- | lib/native/windows-64/ffmpeg.dll | bin | 2083906 -> 2083394 bytes | |||
| -rw-r--r-- | lib/native/windows/ffmpeg.dll | bin | 2270200 -> 2270712 bytes | |||
| -rw-r--r-- | src/native/ffmpeg/Makefile | 2 |
4 files changed, 1 insertions, 1 deletions
diff --git a/lib/native/mac/libffmpeg.jnilib b/lib/native/mac/libffmpeg.jnilib Binary files differindex 2329c79..17d8d44 100755 --- a/lib/native/mac/libffmpeg.jnilib +++ b/lib/native/mac/libffmpeg.jnilib diff --git a/lib/native/windows-64/ffmpeg.dll b/lib/native/windows-64/ffmpeg.dll Binary files differindex 262ca39..fa3f2a2 100644 --- a/lib/native/windows-64/ffmpeg.dll +++ b/lib/native/windows-64/ffmpeg.dll diff --git a/lib/native/windows/ffmpeg.dll b/lib/native/windows/ffmpeg.dll Binary files differindex dc234ac..9fddfca 100644 --- a/lib/native/windows/ffmpeg.dll +++ b/lib/native/windows/ffmpeg.dll diff --git a/src/native/ffmpeg/Makefile b/src/native/ffmpeg/Makefile index 01cc563..56b23ca 100644 --- a/src/native/ffmpeg/Makefile +++ b/src/native/ffmpeg/Makefile @@ -15,7 +15,7 @@ CPPFLAGS=-DJNI_IMPLEMENTATION \ #TARGET=../../../lib/native/mac/libffmpeg.jnilib
# Windows configuration
-# CPPFLAGS+=-I$(JAVA_HOME)/include/win32
+#CPPFLAGS+=-I$(JAVA_HOME)/include/win32
#LDFLAGS=-Wl,--kill-at -shared
# Choose between 32-bit or 64-bit
#TARGET=../../../lib/native/windows/ffmpeg.dll
|