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

- ffmpeg: use master branch as default as we want to test some new fixes

master
gixxpunk 7 years ago
parent
c0b5ee921e
commit
6c6a20dc06
1 changed files with 2 additions and 2 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. 4
      make/environment.mk

4
make/environment.mk
View File

@ -268,8 +268,8 @@ NI_DRIVERS-BIN = ni-drivers-bin
# ffmpeg/master is currently not mature enough for daily use # ffmpeg/master is currently not mature enough for daily use
# if you want to help testing you can enable it here # if you want to help testing you can enable it here
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_OPENTHREADS = ni-openthreads NI_OPENTHREADS = ni-openthreads

Write Preview
Loading…
Cancel
Save