Skip to content

Commit d4e0f8d

Browse files
author
Andrea Medeghini
committed
Updated ffmpeg4java.i to latest ffmpeg headers. Fixed build scripts.
1 parent 8009615 commit d4e0f8d

4 files changed

Lines changed: 8418 additions & 5263 deletions

File tree

Makefile.jni.linux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ JAVA_HOME=/usr/lib/jvm/java-8-oracle
55
OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.ffmpeg4java/src/main/resources/linux
66

77
all:
8-
mkdir -p $(OUTPUT_DIR) && gcc --verbose -o $(OUTPUT_DIR)/libffmpeg4java.so -L. -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,-soname,libffmpeg4java.so -shared -fPIC -Wall -m$(LIB_TYPE) -lstdc++ -lm -Llibavformat -Llibavcodec -Llibavutil -Llibavfilter -Llibavdevice -Llibswscale -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lm -lz $(BUILD_DIR)/ffmpeg4java_wrap.c
8+
mkdir -p $(OUTPUT_DIR) && gcc --verbose -o $(OUTPUT_DIR)/libffmpeg4java.so -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,-soname,libffmpeg4java.so -shared -fPIC -Wall -m$(LIB_TYPE) -Llibavutil -Llibavformat -Llibavfilter -Llibavcodec -Llibavdevice -Llibswscale -Llibswresample -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lswresample -lstdc++ -lm -lz $(BUILD_DIR)/ffmpeg4java_wrap.c

Makefile.jni.macos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ JAVA_HOME=`/usr/libexec/java_home`
55
OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.ffmpeg4java/src/main/resources/macos
66

77
all:
8-
mkdir -p $(OUTPUT_DIR) && gcc --verbose -o $(OUTPUT_DIR)/libffmpeg4java.jnilib -std=gnu99 -I. -L. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -shared -fPIC -Wall -m$(LIB_TYPE) -Llibavformat -Llibavcodec -Llibavutil -Llibavfilter -Llibavdevice -Llibswscale $(BUILD_DIR)/ffmpeg4java_wrap.c -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lm -lz -lbz2
8+
mkdir -p $(OUTPUT_DIR) && gcc --verbose -o $(OUTPUT_DIR)/libffmpeg4java.jnilib -std=gnu99 -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -shared -fPIC -Wall -m$(LIB_TYPE) -Llibavutil -Llibavformat -Llibavfilter -Llibavcodec -Llibavdevice -Llibswscale -Llibswresample $(BUILD_DIR)/ffmpeg4java_wrap.c -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lswresample -lm -lz -lbz2 -liconv -framework VideoToolbox -framework AudioToolbox -framework AVFoundation -framework Foundation -framework CoreImage -framework CoreGraphics -framework CoreMedia -framework QuartzCore -framework OpenGL -framework OpenAL -framework VideoDecodeAcceleration -framework QTKit -framework AppKit -framework Security
99

Makefile.jni.mingw64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ JAVA_HOME=/usr/lib/jvm/java-8-oracle
55
OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.ffmpeg4java/src/main/resources/win32
66

77
all:
8-
mkdir -p $(OUTPUT_DIR) && x86_64-w64-mingw32-gcc --verbose -o $(OUTPUT_DIR)/ffmpeg4java.dll -L. -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,--out-implib=libffmpeg4java.dll.a -Wl,-add-stdcall-alias -shared -fPIC -Wall -m$(LIB_TYPE) -Ilibavformat -Ilibavcodec -Ilibavutil -Ilibavfilter -Ilibavdevice -Ilibswscale -Llibavformat -Llibavcodec -Llibavutil -Llibavfilter -Llibavdevice -Llibswscale $(BUILD_DIR)/ffmpeg4java_wrap.c -lavutil -lavformat -lavfilter -lavcodec -lavdevice -lswscale -lm -lws2_32
8+
mkdir -p $(OUTPUT_DIR) && x86_64-w64-mingw32-gcc --verbose -o $(OUTPUT_DIR)/ffmpeg4java.dll -I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wl,--out-implib=libffmpeg4java.dll.a -Wl,-add-stdcall-alias -shared -fPIC -Wall -m$(LIB_TYPE) -Llibavutil -Llibavformat -Llibavfilter -Llibavcodec -Llibavdevice -Llibswscale -Llibswresample $(BUILD_DIR)/ffmpeg4java_wrap.c -lavformat -lavdevice -lavfilter -lavcodec -lavutil -lswscale -lswresample -lm -lws2_32 -luuid -lsecur32 -lshlwapi -lgdi32 -lopengl32 -lstrmiids -lole32 -loleaut32 -lquartz -lavifil32 -lmsvfw32 -lavicap32

0 commit comments

Comments
 (0)