- add unpatched ffmpeg master branch as requested

7 years ago · 280f02308f
2 changed files with 2 additions and 1 deletions
--- 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
--- 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 \