diff options
| author | Peter Frühberger <Peter.Fruehberger@gmail.com> | 2015-07-09 08:18:07 +0200 |
|---|---|---|
| committer | Peter Frühberger <Peter.Fruehberger@gmail.com> | 2015-07-09 08:18:07 +0200 |
| commit | ca773c6faa4ae39861af1b81730e44ec6043474c (patch) | |
| tree | 309b5e012dff85326969f82650af56344d2ceed7 /tools | |
| parent | d04084e94f24efdef7f1f630cbf4258d25b0c623 (diff) | |
| parent | e333b52740639f201cf7ac14f259c5a87d4cc389 (diff) | |
Merge pull request #7415 from fritsch/ffmpeg-bump-27-master
Ffmpeg bump 27 master
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/ffmpeg/FFMPEG-VERSION | 2 | ||||
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION index 1d5dd2ff43..54563b2f1a 100644 --- a/tools/depends/target/ffmpeg/FFMPEG-VERSION +++ b/tools/depends/target/ffmpeg/FFMPEG-VERSION @@ -1,5 +1,5 @@ LIBNAME=ffmpeg BASE_URL=https://github.com/xbmc/FFmpeg/archive -VERSION=2.6.2-Isengard-beta +VERSION=2.7.1-JUnknown-alpha ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 711182f6b0..18479f3903 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -45,6 +45,7 @@ ifeq ($(OS), osx) ffmpg_config += --disable-outdev=sdl ffmpg_config += --disable-decoder=mpeg_xvmc --enable-vda --disable-crystalhd ffmpg_config += --target-os=darwin + ffmpg_config += --disable-securetransport endif ifeq ($(findstring arm, $(CPU)), arm) ffmpg_config += --enable-pic --disable-armv5te --disable-armv6t2 |