summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@mediaserver.Belkin>2010-02-18 23:00:15 +0100
committerroot <root@mediaserver.Belkin>2010-02-18 23:00:15 +0100
commit640401dc818da45736bb5fdd784709a1553e38b3 (patch)
tree48859f38e0462acd8b88861f54d21ea854793578
parent86f80a5da2cdf92283113ff80e48a0fd4b266e7e (diff)
downloadistreamdev-640401dc818da45736bb5fdd784709a1553e38b3.tar.gz
istreamdev-640401dc818da45736bb5fdd784709a1553e38b3.tar.bz2
Debug Media streaming for folder with space in name.
-rwxr-xr-xcss/style.css1
-rwxr-xr-xincludes/inc_files.php2
-rwxr-xr-xincludes/include.php2
3 files changed, 3 insertions, 2 deletions
diff --git a/css/style.css b/css/style.css
index eeb1e44..2bfe77f 100755
--- a/css/style.css
+++ b/css/style.css
@@ -1157,3 +1157,4 @@ li.select .arrow {
.smallfield:last-child input {
-webkit-border-bottom-right-radius: 8px;
}
+
diff --git a/includes/inc_files.php b/includes/inc_files.php
index f6dff09..15ef491 100755
--- a/includes/inc_files.php
+++ b/includes/inc_files.php
@@ -28,7 +28,7 @@ function mediagetinfostream($stream = "")
// Extract a thumbnail
exec("rm ram/stream-tb.png");
- exec($ffmpegpath ." -y -i \"" .$stream ."\" -an -ss 00:00:05.00 -r 1 -vframes 1 -s 80x80 -f mjpeg ram/stream-tb.png");
+ exec($ffmpegpath ." -y -i \"" .$stream ."\" -an -ss 00:00:05.00 -r 1 -vframes 1 -s 128x72 -f mjpeg ram/stream-tb.png");
return array($title, $info);
}
diff --git a/includes/include.php b/includes/include.php
index 05aa4b5..157cccf 100755
--- a/includes/include.php
+++ b/includes/include.php
@@ -100,7 +100,7 @@ function start_stream($type, $name, $title, $desc, $qname, $qparams, $category,
$cmd = "export SHELL=\"/bin/sh\";printf \"cat \\\"" .$url ."\\\"/0* | ./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." \" | at now";
break;
case 3:
- $cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." \" | at now";
+ $cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh '" .$url ."' " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." \" | at now";
break;
default:
$cmd = "";