From af217147219a74e7a5d1783559f90eca8a0f2367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Mon, 27 Oct 2014 11:48:43 +0100 Subject: [PATCH] Add a parameter to disable openH264 decoder while buildind --- Makefile | 3 ++- README | 3 +++ submodules/msopenh264 | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5d91f2ddb..df25baf0c 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,7 @@ endif NDK_DEBUG=0 BUILD_VIDEO=1 BUILD_OPENH264=1 +ENABLE_OPENH264_DECODER=1 BUILD_UPNP=1 BUILD_AMRNB=full # 0, light or full BUILD_AMRWB=1 @@ -399,7 +400,7 @@ prepare-sources: build-ffmpeg build-x264 build-openh264 prepare-ilbc build-vpx p GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \ BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \ - BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) BUILD_OPENH264=$(BUILD_OPENH264) BUILD_MATROSKA=$(BUILD_MATROSKA) \ + BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) BUILD_OPENH264=$(BUILD_OPENH264) ENABLE_OPENH264_DECODER=$(ENABLE_OPENH264_DECODER) BUILD_MATROSKA=$(BUILD_MATROSKA) \ BUILD_UPNP=$(BUILD_UPNP) BUILD_ZRTP=$(BUILD_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC) diff --git a/README b/README index da28a45c4..67d3933ff 100644 --- a/README +++ b/README @@ -65,6 +65,9 @@ BUILD_VIDEO BUILD_OPENH264 values: 0 (don't build openH264) or 1 (build openH264), default value: 1 +ENABLE_OPENH264_DECODER + values: 0 (disable openh264 decoder) or 1 (enable openh264 decoder), default value: 1 + BUILD_X264 values: 0 (don't build x264) or 1 (build x264), default value: 0 diff --git a/submodules/msopenh264 b/submodules/msopenh264 index 9c177be0d..5ba043abf 160000 --- a/submodules/msopenh264 +++ b/submodules/msopenh264 @@ -1 +1 @@ -Subproject commit 9c177be0d2ca08bf0c09fd78c2990f793731f7aa +Subproject commit 5ba043abf7c68fc2d3a36b3cfdb19dc19fd498c7