diff options
| author | wsnipex <wsnipex@a1.net> | 2014-11-24 09:33:41 +0100 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2014-12-20 15:10:37 +0100 |
| commit | 313b9df535ed5d2405bd14437960e747211e5185 (patch) | |
| tree | 13182cf75afbb2495ef9bc577a6953e338ad13f7 | |
| parent | bcb5b9f140aa500e48c44ba87b49e5e150a9bf59 (diff) | |
[android] re-enable gnutls in ffmpeg
| -rw-r--r-- | tools/depends/target/Makefile | 2 | ||||
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index 3598d1968e..e140ab594b 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -36,7 +36,7 @@ endif ifeq ($(OS),android) DEPENDS += mdnsresponder android-sources-ics - EXCLUDED_DEPENDS = gmp nettle gnutls + FFMPEG_DEPENDS = gnutls endif DEPENDS := $(filter-out $(EXCLUDED_DEPENDS),$(DEPENDS)) diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 0e08dcf1e5..ff4bc0d8db 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -32,7 +32,7 @@ ifeq ($(OS), android) else ffmpg_config += --cpu=i686 --disable-mmx endif - ffmpg_config += --target-os=linux + ffmpg_config += --target-os=linux --enable-gnutls endif ifeq ($(OS), ios) ffmpg_config += --cpu=cortex-a8 --yasmexe=$(NATIVEPREFIX)/bin/yasm |