* Add libvpx in the cppbuild.sh script for FFmpeg to support the W…

…ebM format (issue #33) * Upgrade presets for FFmpeg 2.7 and OpenSSL 1.0.2c
bytedeco · Jun 13, 2015 · 3c1fdbe · 3c1fdbe
1 parent 65d8112
commit 3c1fdbe
Show file tree

Hide file tree

Showing 12 changed files with 432 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 
- * Upgrade presets for OpenCV 3.0.0, FFmpeg 2.6.3, x265 1.7, Leptonica 1.72, LLVM 3.6.1, and the latest of Caffe
+ * Add libvpx in the `cppbuild.sh` script for FFmpeg to support the WebM format ([issue #33](https://github.com/bytedeco/javacpp-presets/issues/33))
+ * Upgrade presets for OpenCV 3.0.0, FFmpeg 2.7, OpenSSL 1.0.2c, x265 1.7, Leptonica 1.72, LLVM 3.6.1, and the latest of Caffe
  * Define commonly used OpenCV `std::vector` types (`PointVector`, `Point2fVector`, `Point2dVector`, `SizeVector`, `RectVector`, `KeyPointVector`, `DMatchVector`) for ease of use and performance reasons
  * Map `cv::saturate_cast<>()` in a more meaningful way ([issue #53](https://github.com/bytedeco/javacpp-presets/issues/53)) and name these functions more consistently
  * In addition to Leptonica and Tesseract, use only the officially supported GCC compiler for FFmpeg, FFTW, and GSL under Windows as well, to prevent compatibility issues ([issue bytedeco/javacv#137](https://github.com/bytedeco/javacv/issues/137))

diff --git a/ffmpeg/LICENSE.libvpx b/ffmpeg/LICENSE.libvpx
@@ -0,0 +1,31 @@
+Copyright (c) 2010, The WebM Project authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google, nor the WebM Project, nor the names
+    of its contributors may be used to endorse or promote products
+    derived from this software without specific prior written
+    permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/ffmpeg/cppbuild.sh b/ffmpeg/cppbuild.sh
@@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then
 fi
 
 if [[ $PLATFORM == windows* ]]; then
-    FFMPEG_VERSION=20150517-git-2acc065
+    FFMPEG_VERSION=2.7
     [[ $PLATFORM == *64 ]] && BITS=64 || BITS=32
     download http://ffmpeg.zeranoe.com/builds/win$BITS/dev/ffmpeg-$FFMPEG_VERSION-win$BITS-dev.7z ffmpeg-$FFMPEG_VERSION-win$BITS-dev.7z
     download http://ffmpeg.zeranoe.com/builds/win$BITS/shared/ffmpeg-$FFMPEG_VERSION-win$BITS-shared.7z ffmpeg-$FFMPEG_VERSION-win$BITS-shared.7z
@@ -21,15 +21,17 @@ else
     LAME=lame-3.99.5
     SPEEX=speex-1.2rc1
     OPENCORE_AMR=opencore-amr-0.1.3
-    OPENSSL=openssl-1.0.2a
+    OPENSSL=openssl-1.0.2c
     X265=x265_1.7
-    FFMPEG_VERSION=2.6.3
+    VPX_VERSION=v1.4.0
+    FFMPEG_VERSION=2.7
     download http://downloads.sourceforge.net/project/lame/lame/3.99/$LAME.tar.gz $LAME.tar.gz
     download http://downloads.xiph.org/releases/speex/$SPEEX.tar.gz $SPEEX.tar.gz
     download http://sourceforge.net/projects/opencore-amr/files/opencore-amr/$OPENCORE_AMR.tar.gz/download $OPENCORE_AMR.tar.gz
     download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz
     download ftp://ftp.videolan.org/pub/videolan/x264/snapshots/last_stable_x264.tar.bz2 last_stable_x264.tar.bz2
     download https://bitbucket.org/multicoreware/x265/downloads/$X265.tar.gz $X265.tar.gz
+    download https://chromium.googlesource.com/webm/libvpx/+archive/$VPX_VERSION.tar.gz libvpx-$VPX_VERSION.tar.gz
     download http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2 ffmpeg-$FFMPEG_VERSION.tar.bz2
 
     mkdir -p $PLATFORM
@@ -41,6 +43,8 @@ else
     tar -xzvf ../$OPENSSL.tar.gz
     tar -xjvf ../last_stable_x264.tar.bz2
     tar -xzvf ../$X265.tar.gz
+    mkdir -p libvpx-$VPX_VERSION
+    tar -xzvf ../libvpx-$VPX_VERSION.tar.gz -C libvpx-$VPX_VERSION
     tar -xjvf ../ffmpeg-$FFMPEG_VERSION.tar.bz2
     X264=`echo x264-snapshot-*`
 fi
@@ -76,9 +80,13 @@ case $PLATFORM in
         $CMAKE -DENABLE_CLI=OFF -DENABLE_SHARED=OFF -DCMAKE_TOOLCHAIN_FILE=android-arm.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. source
         make -j4
         make install
+        cd ../libvpx-$VPX_VERSION
+        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples --sdk-path=$ANDROID_NDK --target=armv7-android-gcc --disable-runtime-cpu-detect --disable-neon --disable-neon-asm
+        make -j4
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
         patch -Np1 < ../../../ffmpeg-$FFMPEG_VERSION-android.patch
-        ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --disable-iconv --disable-libxcb --disable-opencl --disable-outdev=sdl --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-openssl --enable-libx264 --enable-libx265 --enable-cross-compile --cross-prefix="$ANDROID_BIN-" --ranlib="$ANDROID_BIN-ranlib" --sysroot="$ANDROID_ROOT" --target-os=linux --arch=arm --extra-cflags="-I../include/ -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300" --extra-ldflags="$ANDROID_ROOT/usr/lib/crtbegin_so.o -L../lib/ -L$ANDROID_CPP/libs/armeabi/ -nostdlib -Wl,--fix-cortex-a8" --extra-libs="-lgnustl_static -lgcc -ldl -lz -lm -lc" --disable-symver --disable-programs
+        ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --disable-iconv --disable-libxcb --disable-opencl --disable-outdev=sdl --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-openssl --enable-libx264 --enable-libx265 --enable-libvpx --enable-cross-compile --cross-prefix="$ANDROID_BIN-" --ranlib="$ANDROID_BIN-ranlib" --sysroot="$ANDROID_ROOT" --target-os=linux --arch=arm --extra-cflags="-I../include/ -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300" --extra-ldflags="$ANDROID_ROOT/usr/lib/crtbegin_so.o -L../lib/ -L$ANDROID_CPP/libs/armeabi/ -nostdlib -Wl,--fix-cortex-a8" --extra-libs="-lgnustl_static -lgcc -ldl -lz -lm -lc" --disable-symver --disable-programs
         make -j4
         make install
         ;;
@@ -112,9 +120,13 @@ case $PLATFORM in
         $CMAKE -DENABLE_CLI=OFF -DENABLE_SHARED=OFF -DCMAKE_TOOLCHAIN_FILE=android-x86.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. source
         make -j4 x265-static
         make install
+        cd ../libvpx-$VPX_VERSION
+        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples --sdk-path=$ANDROID_NDK --target=x86-android-gcc
+        make -j4
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
         patch -Np1 < ../../../ffmpeg-$FFMPEG_VERSION-android.patch
-        ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --disable-iconv --disable-libxcb --disable-opencl --disable-outdev=sdl --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-openssl --enable-libx264 --enable-libx265 --enable-cross-compile --cross-prefix="$ANDROID_BIN-" --ranlib="$ANDROID_BIN-ranlib" --sysroot="$ANDROID_ROOT" --target-os=linux --arch=atom --extra-cflags="-I../include/ -DANDROID -fPIC -ffunction-sections -funwind-tables -mssse3 -mfpmath=sse -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300" --extra-ldflags="$ANDROID_ROOT/usr/lib/crtbegin_so.o -L../lib/ -L$ANDROID_CPP/libs/x86/ -nostdlib" --extra-libs="-lgnustl_static -lgcc -ldl -lz -lm -lc" --disable-symver --disable-programs
+        ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --disable-iconv --disable-libxcb --disable-opencl --disable-outdev=sdl --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-openssl --enable-libx264 --enable-libx265 --enable-libvpx --enable-cross-compile --cross-prefix="$ANDROID_BIN-" --ranlib="$ANDROID_BIN-ranlib" --sysroot="$ANDROID_ROOT" --target-os=linux --arch=atom --extra-cflags="-I../include/ -DANDROID -fPIC -ffunction-sections -funwind-tables -mssse3 -mfpmath=sse -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300" --extra-ldflags="$ANDROID_ROOT/usr/lib/crtbegin_so.o -L../lib/ -L$ANDROID_CPP/libs/x86/ -nostdlib" --extra-libs="-lgnustl_static -lgcc -ldl -lz -lm -lc" --disable-symver --disable-programs
         make -j4
         make install
         ;;
@@ -143,8 +155,12 @@ case $PLATFORM in
         CC="gcc -m32" CXX="g++ -m32" $CMAKE -DENABLE_SHARED=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. source
         make -j4
         make install
+        cd ../libvpx-$VPX_VERSION
+        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples --target=x86-linux-gcc
+        make -j4
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
-        PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --disable-iconv --disable-libxcb --disable-opencl --disable-outdev=sdl --enable-x11grab --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-openssl --enable-libx264 --enable-libx265 --cc="gcc -m32" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/" --extra-libs="-lstdc++ -ldl"
+        PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --disable-iconv --disable-libxcb --disable-opencl --disable-outdev=sdl --enable-x11grab --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-openssl --enable-libx264 --enable-libx265 --enable-libvpx --cc="gcc -m32" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/" --extra-libs="-lstdc++ -ldl"
         make -j4
         make install
         ;;
@@ -173,8 +189,12 @@ case $PLATFORM in
         CC="gcc -m64" CXX="g++ -m64" $CMAKE -DENABLE_SHARED=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. source
         make -j4
         make install
+        cd ../libvpx-$VPX_VERSION
+        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples --target=x86_64-linux-gcc
+        make -j4
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
-        PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --disable-iconv --disable-libxcb --disable-opencl --disable-outdev=sdl --enable-x11grab --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-openssl --enable-libx264 --enable-libx265 --cc="gcc -m64" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/" --extra-libs="-lstdc++ -ldl"
+        PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --disable-iconv --disable-libxcb --disable-opencl --disable-outdev=sdl --enable-x11grab --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-openssl --enable-libx264 --enable-libx265 --enable-libvpx --cc="gcc -m64" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/" --extra-libs="-lstdc++ -ldl"
         make -j4
         make install
         ;;
@@ -203,9 +223,13 @@ case $PLATFORM in
         CC="clang" CXX="clang++" $CMAKE -DENABLE_SHARED=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. source
         make -j4
         make install
+        cd ../libvpx-$VPX_VERSION
+        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples
+        make -j4
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
         patch -Np1 < ../../../ffmpeg-$FFMPEG_VERSION-macosx.patch
-        PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --disable-iconv --disable-libxcb --disable-opencl --disable-outdev=sdl --enable-indev=avfoundation --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-openssl --enable-libx264 --enable-libx265 --extra-cflags="-I../include/" --extra-ldflags="-L../lib/ -Wl,-headerpad_max_install_names" --extra-libs="-lstdc++ -ldl" --disable-doc
+        PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. --enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --disable-iconv --disable-libxcb --disable-opencl --disable-outdev=sdl --enable-indev=avfoundation --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-openssl --enable-libx264 --enable-libx265 --enable-libvpx --extra-cflags="-I../include/" --extra-ldflags="-L../lib/" --extra-libs="-lstdc++ -ldl" --disable-doc
         make -j4
         make install
         ;;

diff --git a/ffmpeg/ffmpeg-2.6.3-android.patch → ffmpeg/ffmpeg-2.7-android.patch b/ffmpeg/ffmpeg-2.6.3-android.patch → ffmpeg/ffmpeg-2.7-android.patch
@@ -1,7 +1,7 @@
-diff -ruN ffmpeg-2.5.4/configure ffmpeg-2.5.4-android/configure
---- ffmpeg-2.5.4/configure	2015-02-14 00:56:33.000000000 +0900
-+++ ffmpeg-2.5.4-android/configure	2015-02-20 23:49:04.739388778 +0900
-@@ -4885,7 +4885,7 @@
+diff -ruN ffmpeg-2.7/configure ffmpeg-2.7-android/configure
+--- ffmpeg-2.7/configure	2015-06-10 08:27:49.000000000 +0900
++++ ffmpeg-2.7-android/configure	2015-06-13 13:37:38.401719268 +0900
+@@ -5124,7 +5124,7 @@
                                 require smbclient libsmbclient.h smbc_init -lsmbclient; }
  enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr
  enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init
@@ -10,19 +10,19 @@ diff -ruN ffmpeg-2.5.4/configure ffmpeg-2.5.4-android/configure
  enabled libstagefright_h264 && require_cpp libstagefright_h264 "binder/ProcessState.h media/stagefright/MetaData.h
      media/stagefright/MediaBufferGroup.h media/stagefright/MediaDebug.h media/stagefright/MediaDefs.h
      media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder -lgnustl_static
-@@ -4913,7 +4913,7 @@
+@@ -5154,7 +5154,7 @@
                                   warn "using libx264 without pkg-config"; } } &&
                               { check_cpp_condition x264.h "X264_BUILD >= 118" ||
                                 die "ERROR: libx264 must be installed and version must be >= 0.118."; }
 -enabled libx265           && require_pkg_config x265 x265.h x265_encoder_encode &&
 +enabled libx265           && require x265 x265.h x265_encoder_encode -lx265 &&
-                              { check_cpp_condition x265.h "X265_BUILD >= 17" ||
-                                die "ERROR: libx265 version must be >= 17."; }
+                              { check_cpp_condition x265.h "X265_BUILD >= 57" ||
+                                die "ERROR: libx265 version must be >= 57."; }
  enabled libxavs           && require libxavs xavs.h xavs_encoder_encode -lxavs
-diff -ruN ffmpeg-2.5.4/library.mak ffmpeg-2.5.4-android/library.mak
---- ffmpeg-2.5.4/library.mak	2015-02-14 00:56:25.000000000 +0900
-+++ ffmpeg-2.5.4-android/library.mak	2015-02-20 23:48:46.564033472 +0900
-@@ -48,16 +48,13 @@
+diff -ruN ffmpeg-2.7/library.mak ffmpeg-2.7-android/library.mak
+--- ffmpeg-2.7/library.mak	2015-06-10 08:27:53.000000000 +0900
++++ ffmpeg-2.7-android/library.mak	2015-06-13 13:37:38.401719268 +0900
+@@ -52,16 +52,13 @@
  $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
  	$$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)
 
@@ -41,7 +41,7 @@ diff -ruN ffmpeg-2.5.4/library.mak ffmpeg-2.5.4-android/library.mak
  endif
 
  clean::
-@@ -69,9 +66,8 @@
+@@ -73,9 +70,8 @@
 
  install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
  	$(Q)mkdir -p "$(SHLIBDIR)"
@@ -53,8 +53,8 @@ diff -ruN ffmpeg-2.5.4/library.mak ffmpeg-2.5.4-android/library.mak
  	$(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%) "$(SHLIBDIR)")
  	$(if $(SLIB_INSTALL_EXTRA_LIB),$(Q)mkdir -p "$(LIBDIR)")
  	$(if $(SLIB_INSTALL_EXTRA_LIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_LIB:%=$(SUBDIR)%) "$(LIBDIR)")
-@@ -90,9 +86,7 @@
- 	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
+@@ -94,9 +90,7 @@
+ 	$$(INSTALL) -m 644 $$^ "$(PKGCONFIGDIR)"
 
  uninstall-libs::
 -	-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \

diff --git a/ffmpeg/ffmpeg-2.6.3-macosx.patch → ffmpeg/ffmpeg-2.7-macosx.patch b/ffmpeg/ffmpeg-2.6.3-macosx.patch → ffmpeg/ffmpeg-2.7-macosx.patch
@@ -1,7 +1,7 @@
-diff -ruN ffmpeg-2.5.4/configure ffmpeg-2.5.4-macosx/configure
---- ffmpeg-2.5.4/configure	2015-02-14 00:56:33.000000000 +0900
-+++ ffmpeg-2.5.4-macosx/configure	2015-02-20 23:51:52.349665360 +0900
-@@ -4034,7 +4034,7 @@
+diff -ruN ffmpeg-2.7/configure ffmpeg-2.7-macosx/configure
+--- ffmpeg-2.7/configure	2015-06-10 08:27:49.000000000 +0900
++++ ffmpeg-2.7-macosx/configure	2015-06-13 13:41:38.412560126 +0900
+@@ -4220,7 +4220,7 @@
          ;;
      darwin)
          enabled ppc && add_asflags -force_cpusubtype_ALL
@@ -10,7 +10,7 @@ diff -ruN ffmpeg-2.5.4/configure ffmpeg-2.5.4-macosx/configure
          enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
          strip="${strip} -x"
          add_ldflags -Wl,-dynamic,-search_paths_first
-@@ -4885,7 +4885,7 @@
+@@ -5124,7 +5124,7 @@
                                 require smbclient libsmbclient.h smbc_init -lsmbclient; }
  enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr
  enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init
@@ -19,12 +19,12 @@ diff -ruN ffmpeg-2.5.4/configure ffmpeg-2.5.4-macosx/configure
  enabled libstagefright_h264 && require_cpp libstagefright_h264 "binder/ProcessState.h media/stagefright/MetaData.h
      media/stagefright/MediaBufferGroup.h media/stagefright/MediaDebug.h media/stagefright/MediaDefs.h
      media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder -lgnustl_static
-@@ -4913,7 +4913,7 @@
+@@ -5154,7 +5154,7 @@
                                   warn "using libx264 without pkg-config"; } } &&
                               { check_cpp_condition x264.h "X264_BUILD >= 118" ||
                                 die "ERROR: libx264 must be installed and version must be >= 0.118."; }
 -enabled libx265           && require_pkg_config x265 x265.h x265_encoder_encode &&
 +enabled libx265           && require x265 x265.h x265_encoder_encode -lx265 &&
-                              { check_cpp_condition x265.h "X265_BUILD >= 17" ||
-                                die "ERROR: libx265 version must be >= 17."; }
+                              { check_cpp_condition x265.h "X265_BUILD >= 57" ||
+                                die "ERROR: libx265 version must be >= 57."; }
  enabled libxavs           && require libxavs xavs.h xavs_encoder_encode -lxavs
diff --git a/ffmpeg/pom.xml b/ffmpeg/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco.javacpp-presets</groupId>
   <artifactId>ffmpeg</artifactId>
-  <version>2.6.3-${project.parent.version}</version>
+  <version>2.7-${project.parent.version}</version>
   <packaging>jar</packaging>
   <name>JavaCPP Presets for FFmpeg</name>