diff --git a/lib/native/mac/libffmpeg.jnilib b/lib/native/mac/libffmpeg.jnilib index 9bd79ec4e..78a4c2d87 100755 Binary files a/lib/native/mac/libffmpeg.jnilib and b/lib/native/mac/libffmpeg.jnilib differ diff --git a/src/native/ffmpeg/Makefile b/src/native/ffmpeg/Makefile index 66ffa7f3d..9f5983fe5 100644 --- a/src/native/ffmpeg/Makefile +++ b/src/native/ffmpeg/Makefile @@ -8,7 +8,10 @@ CC=gcc CPPFLAGS=-DJNI_IMPLEMENTATION \ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/win32 \ -I$(FFMPEG_HOME) -#LDFLAGS=-dynamiclib +#-fPIC \ + + +#LDFLAGS=-dynamiclib -Wl,-read_only_relocs,suppress LDFLAGS=-Wl,--kill-at -shared LIBS=-L$(FFMPEG_HOME)/libavformat -L$(FFMPEG_HOME)/libavcodec -L$(FFMPEG_HOME)/libavutil \ -L$(X264_HOME) \ diff --git a/src/native/ffmpeg/README b/src/native/ffmpeg/README index e4d8645d8..63577654f 100644 --- a/src/native/ffmpeg/README +++ b/src/native/ffmpeg/README @@ -4,13 +4,10 @@ ./configure --disable-pthread -- Linux +- Linux, Mac OS X ./configure --enable-pic -- Mac OS X -./configure --disable-asm - 2. ffmpeg-r16801 - Windows @@ -29,7 +26,7 @@ --disable-ffserver --disable-ffplay --disable-ffmpeg \ --disable-pthreads --enable-w32threads -- Linux, Mac OS X(removed from configure the option to add -mdynamic-no-pic) +- Linux ./configure \ --disable-mmx \ @@ -43,3 +40,17 @@ --disable-debug \ --disable-ffserver --disable-ffplay --disable-ffmpeg \ --enable-pthreads + +- Mac OS X(removed from configure script the option to add -mdynamic-no-pic) +./configure \ + --disable-mmx \ + --enable-static --disable-shared --shlibdir=. \ + --disable-encoders --disable-decoders --disable-muxers --disable-demuxers \ + --disable-parsers --disable-bsfs --disable-protocols --disable-devices \ + --disable-network \ + --enable-libx264 --enable-gpl --enable-parser=h264 --enable-encoder=libx264 \ + --enable-decoder=h264 --enable-muxer=h264 --enable-demuxer=h264 \ + --extra-ldflags="-fPIC -L$X264_HOME" --extra-cflags="-fPIC -I$X264_HOME" \ + --disable-debug \ + --disable-ffserver --disable-ffplay --disable-ffmpeg \ + --enable-pthreads