Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Conflicts:
	configure.ac
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit

src/gui/movieplayer.cpp

@@ -2918,6 +2918,8 @@ void CMoviePlayerGui::makeScreenShot(bool autoshot, bool
 		}
 	}
 	sc->Start();
+#else
+	(void)forcover;
 #endif
 	if (autoshot)
 		autoshot_done = true;