From be8ef02a7c808c64e490fa73f37ba1babaeb979f Mon Sep 17 00:00:00 2001
From: Kfir Itzhak <mastertheknife@gmail.com>
Date: Sat, 16 Jul 2011 14:48:44 +0300
Subject: [PATCH] Small corrections

---
 web/skins/classic/views/monitorprobe.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/skins/classic/views/monitorprobe.php b/web/skins/classic/views/monitorprobe.php
index a282f6d71..0f26d6331 100644
--- a/web/skins/classic/views/monitorprobe.php
+++ b/web/skins/classic/views/monitorprobe.php
@@ -45,7 +45,7 @@ if ( ZM_HAS_V4L2 )
 
     $devices = array();
     $preferredStandards = array( 'PAL', 'NTSC' );
-    $preferredFormats = array( 'BGR4', 'RGB4', 'BGR3', 'RGB3', 'YUYV', 'UYVY', 'JPEG', 'MJPG', '422P', 'YU12', 'GREY');
+    $preferredFormats = array( 'BGR3', 'RGB3', 'YUYV', 'UYVY', 'JPEG', 'MJPG', '422P', 'YU12', 'GREY' );
     foreach ( $output as $line )
     {
         if ( !preg_match( '/^d:([^|]+).*S:([^|]*).*F:([^|]+).*I:(\d+)\|(.+)$/', $line, $deviceMatches ) )
@@ -126,7 +126,7 @@ function probeAxis( $ip )
             'Host'     => $ip,
             'Port'     => 80,
             'Path'     => '/axis-cgi/mjpg/video.cgi?resolution=320x240',
-            'Colours'  => 3,
+            'Palette'  => 3,
             'Width'    => 320,
             'Height'   => 240,
         ),
@@ -160,7 +160,7 @@ function probePana( $ip )
             'Host'     => $ip,
             'Port'     => 80,
             'Path'     => '/nphMotionJpeg?Resolution=320x240&Quality=Standard',
-            'Colours'  => 3,
+            'Palette'  => 3,
             'Width'    => 320,
             'Height'   => 240,
         ),
@@ -180,7 +180,7 @@ function probeActi( $ip )
             'Host'     => 'Admin:123456@'.$ip,
             'Port'     => 7070,
             'Path'     => '',
-            'Colours'  => 3,
+            'Palette'  => 3,
             'Width'    => 320,
             'Height'   => 240,
         ),
@@ -215,7 +215,7 @@ function probeVivotek( $ip )
             'Host'     => $ip,
             'Port'     => 554,
             'Path'     => '',
-            'Colours'  => 3,
+            'Palette'  => 3,
             'Width'    => 352,
             'Height'   => 240,
         ),