From 6645cd0a8fc5a7c88c3a9e272d0155ced6acbb7a Mon Sep 17 00:00:00 2001 From: jaidhar Date: Tue, 19 Apr 2011 00:09:50 +0000 Subject: [PATCH] eyeZm Plugin: Removed -s tag from ffmpeg to allow it to automatically pick size, and added viewport meta-tag to h264 splash page Signed-off-by: Jai Dhar git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3315 e3e1d417-86f3-4887-817a-d78f3d33393f --- web/skins/xml/includes/functions.php | 2 +- web/skins/xml/views/actions.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/web/skins/xml/includes/functions.php b/web/skins/xml/includes/functions.php index a5498232a..98f911265 100644 --- a/web/skins/xml/includes/functions.php +++ b/web/skins/xml/includes/functions.php @@ -200,7 +200,7 @@ function gdExists() function getFfmpeg264FoutParms($br, $fout) { - $ffparms = "-analyzeduration 0 -acodec copy -s 320x240"; + $ffparms = "-analyzeduration 0 -acodec copy"; $ffparms .= " -vcodec libx264 -b ".$br; $ffparms .= " -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8"; $ffparms .= " -subq 5 -trellis 1 -refs 1 -coder 0 -me_range 16 -keyint_min 25"; diff --git a/web/skins/xml/views/actions.php b/web/skins/xml/views/actions.php index e0f04354a..f6f62adca 100644 --- a/web/skins/xml/views/actions.php +++ b/web/skins/xml/views/actions.php @@ -150,6 +150,7 @@ if (isset($_GET['action'])) { ) ); logXml("Using thumbnail image from ".$thumbsrc); /* Generate H264 Web-page */ + echo "\n"; h264vidHtml($width, $height, $monitor, $br, $thumbsrc); } else if (!strcmp($vcodec, "mjpeg")) { /* MJPEG streaming */