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

7 years ago · 6c6a20dc06
1 changed files with 2 additions and 2 deletions
--- a/make/environment.mk
+++ b/make/environment.mk
@ -268,8 +268,8 @@ NI_DRIVERS-BIN		= ni-drivers-bin
 # ffmpeg/master is currently not mature enough for daily use
 # if you want to help testing you can enable it here
 NI_FFMPEG		= ni-ffmpeg
-NI_FFMPEG_BRANCH	= ni/ffmpeg/2.8
-#NI_FFMPEG_BRANCH	= ni/ffmpeg/master
+#NI_FFMPEG_BRANCH	= ni/ffmpeg/2.8
+NI_FFMPEG_BRANCH	= ni/ffmpeg/master

 NI_OPENTHREADS		= ni-openthreads