From 280f02308f39a80d59028a6696ec66f08a1c43d9 Mon Sep 17 00:00:00 2001 From: gixxpunk Date: Wed, 3 Jan 2018 16:23:33 +0100 Subject: [PATCH] - add unpatched ffmpeg master branch as requested --- make/environment.mk | 1 + make/system-libs.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/make/environment.mk b/make/environment.mk index ebd927ce..12d16f36 100644 --- a/make/environment.mk +++ b/make/environment.mk @@ -320,6 +320,7 @@ NI_STREAMRIPPER = ni-streamripper NI_FFMPEG = ni-ffmpeg NI_FFMPEG_BRANCH ?= ni/ffmpeg/2.8 #NI_FFMPEG_BRANCH ?= ni/ffmpeg/master +#NI_FFMPEG_BRANCH ?= ffmpeg/master TUXBOX_GIT = $(GITHUB)/tuxbox-neutrino TUXBOX_NEUTRINO = gui-neutrino diff --git a/make/system-libs.mk b/make/system-libs.mk index f267df32..36913541 100644 --- a/make/system-libs.mk +++ b/make/system-libs.mk @@ -248,7 +248,7 @@ endif FFMPEG_DEPS = $(D)/openssl $(D)/librtmp $(D)/libbluray $(D)/libass FFMPEG_CONFIGURE_VER = -ifeq ($(NI_FFMPEG_BRANCH), ni/ffmpeg/master) +ifneq ($(NI_FFMPEG_BRANCH), ni/ffmpeg/2.8) FFMPEG_DEPS += $(D)/libxml2 FFMPEG_CONFIGURE_VER = \ --enable-demuxer=dash \