topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- add unpatched ffmpeg master branch as requested

master
gixxpunk 8 years ago
parent
d71b483380
commit
280f02308f
2 changed files with 2 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      make/environment.mk
  2. 2
      make/system-libs.mk

1
make/environment.mk
View File

@ -320,6 +320,7 @@ NI_STREAMRIPPER = ni-streamripper
NI_FFMPEG = ni-ffmpeg NI_FFMPEG = ni-ffmpeg
NI_FFMPEG_BRANCH ?= ni/ffmpeg/2.8 NI_FFMPEG_BRANCH ?= ni/ffmpeg/2.8
#NI_FFMPEG_BRANCH ?= ni/ffmpeg/master #NI_FFMPEG_BRANCH ?= ni/ffmpeg/master
#NI_FFMPEG_BRANCH ?= ffmpeg/master
TUXBOX_GIT = $(GITHUB)/tuxbox-neutrino TUXBOX_GIT = $(GITHUB)/tuxbox-neutrino
TUXBOX_NEUTRINO = gui-neutrino TUXBOX_NEUTRINO = gui-neutrino

2
make/system-libs.mk
View File

@ -248,7 +248,7 @@ endif
FFMPEG_DEPS = $(D)/openssl $(D)/librtmp $(D)/libbluray $(D)/libass FFMPEG_DEPS = $(D)/openssl $(D)/librtmp $(D)/libbluray $(D)/libass
FFMPEG_CONFIGURE_VER = FFMPEG_CONFIGURE_VER =
ifeq ($(NI_FFMPEG_BRANCH), ni/ffmpeg/master) ifneq ($(NI_FFMPEG_BRANCH), ni/ffmpeg/2.8)
FFMPEG_DEPS += $(D)/libxml2 FFMPEG_DEPS += $(D)/libxml2
FFMPEG_CONFIGURE_VER = \ FFMPEG_CONFIGURE_VER = \
--enable-demuxer=dash \ --enable-demuxer=dash \

Write Preview
Loading…
Cancel
Save