From ee59e19183a839784e6ac30ed639548e4f36615e Mon Sep 17 00:00:00 2001
From: root <root@mediaserver.Belkin>
Date: Thu, 18 Feb 2010 17:48:07 +0100
Subject: Second rev with media streaming. Now it works for all video types.
 And some more bugfixes  Committer: Alib <aliboba@free.fr> 	modified:  
 HISTORY 	modified:   config.php 	modified:   css/style.css 
 modified:   includes/inc_media.php 	modified:   includes/inc_rec.php 
 modified:   includes/inc_stream.php 	modified:   includes/inc_vdr.php 
 modified:   includes/include.php 	modified:   istream.sh

---
 config.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'config.php')

diff --git a/config.php b/config.php
index 5a63032..d479ba4 100755
--- a/config.php
+++ b/config.php
@@ -1,5 +1,6 @@
 <?php
-	global $user, $pass, $vdrchannels, $vdrstreamdev, $quality, $httppath, $svdrpip, $svdrpport, $ffmpegpath;
+	global $user, $pass, $vdrchannels, $vdrstreamdev, $quality, $httppath;
+	global $svdrpip, $svdrpport, $ffmpegpath, $videotypes, $audiotypes, $mediainfopath;
 
 	// Http configuration
 	$user = 'istreamdev';		// Login
@@ -14,7 +15,10 @@
 	$vdrrecpath='/video/';
 
 	// Media configuration
+	$mediainfopath='/usr/bin/mediainfo';
 	$mediapath='/mnt/Storage/';
+	$videotypes='avi mkv ts mov mp4 wmv flv mpg mpeg mpeg2 mpv';
+	$audiotypes='mp3 wav aac flac';
 
 	// Encoding
 	//			Name		Video	Audio	Audio channels	Resolution
@@ -22,6 +26,8 @@
 				'3g'	=>	'350k	64k	1		408x272',
 				'Wifi'	=>	'512k	128k	2		480x320'
 			);
+
+	// Misc
 	$ffmpegpath = '/usr/bin/ffmpeg';
 
 	// Version
-- 
cgit v1.2.3