Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



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

lib/libcoolstream2/cs_api.h

@@ -49,6 +49,7 @@ enum CS_LOG_MODULE {
 // Initialization
 void cs_api_init(void);
 void cs_api_exit(void);
+void cs_new_auto_videosystem();
 
 // Memory helpers
 void *cs_malloc_uncached(size_t size);

lib/libcoolstream2/video_cs.h

@@ -190,6 +190,7 @@ private:
 	analog_mode_t		analog_mode_scart;
 	fp_icon			mode_icon;
 	cDemux			*demux;
+	int			current_video_system;
 	//
 	int SelectAutoFormat();
 	void ScalePic();
@@ -244,6 +245,7 @@ public:
 	int Flush(void);
 
 	/* set video_system */
+	int GetVideoSystem();
 	int SetVideoSystem(int video_system, bool remember = true);
 	int SetStreamType(VIDEO_FORMAT type);
 	void SetSyncMode(AVSYNC_TYPE mode);