diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2014-12-30 22:26:04 +0100 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2014-12-30 22:26:04 +0100 |
| commit | a684387aa15c5980667adcb510796c982babbb75 (patch) | |
| tree | 465ce9a6960c76bc477e0919a92a9e843eb96d38 | |
| parent | a3a4154b45df3a08b731577b2e7cba15c8fbcaa0 (diff) | |
| parent | e0d346d7719844659e95e798ccccd9dee358960f (diff) | |
Merge pull request #6062 from FernetMenta/ffmpeg
ffmpeg: bump to 2.5.2
| -rw-r--r-- | tools/depends/target/ffmpeg/FFMPEG-VERSION | 2 | ||||
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 2 | ||||
| -rwxr-xr-x | tools/depends/target/ffmpeg/autobuild.sh | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION index 5db0feb9af..a2df8328bd 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.4.4-Helix +VERSION=2.5.2-Isengard-alpha ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index ff4bc0d8db..83ad6cf85d 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -10,7 +10,7 @@ APPLY_PATCHES=no ffmpg_config = --prefix=$(PREFIX) --extra-version="xbmc-$(VERSION)" ffmpg_config += --cc=$(CC) --cxx=$(CXX) ffmpg_config += --disable-devices --disable-doc -ffmpg_config += --disable-ffplay --disable-ffmpeg +ffmpg_config += --disable-ffplay --disable-ffmpeg --disable-sdl ffmpg_config += --disable-ffprobe --disable-ffserver ffmpg_config += --enable-gpl --enable-runtime-cpudetect ffmpg_config += --enable-postproc --enable-pthreads diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh index 21e40ab849..592cc11076 100755 --- a/tools/depends/target/ffmpeg/autobuild.sh +++ b/tools/depends/target/ffmpeg/autobuild.sh @@ -131,6 +131,7 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ --disable-devices \ --disable-ffplay \ --disable-ffmpeg \ + --disable-sdl \ --disable-ffprobe \ --disable-ffserver \ --disable-doc \ |