Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

ZoneMinder · Oct 1, 2018 · c9423aa · c9423aa
2 parents 592f55a + 1978882
commit c9423aa
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
@@ -921,13 +921,19 @@ function fourcc( $a, $b, $c, $d ) {
 <?php 
 	$videowriteropts = array(
 			0 => 'Disabled',
-			1 => 'X264 Encode',
 			);
-	if ($monitor->Type() == 'Ffmpeg' )
-		$videowriteropts[2] = 'H264 Camera Passthrough';
+
+  if (stripos(php_uname('m'), 'arm') === false )
+    $videowriteropts[1] = 'X264 Encode';
+  else
+    $videowriteropts[1] = array('text'=>'X264 Encode - Not compatible on Arm','disabled'=>1);
+
+  if ($monitor->Type() == 'Ffmpeg' )
+    $videowriteropts[2] = 'H264 Camera Passthrough';
   else
     $videowriteropts[2] = array('text'=>'H264 Camera Passthrough - only for FFMPEG','disabled'=>1);
-	echo htmlselect( 'newMonitor[VideoWriter]', $videowriteropts, $monitor->VideoWriter() );
+
+  echo htmlselect( 'newMonitor[VideoWriter]', $videowriteropts, $monitor->VideoWriter() );
 ?>
             </td></tr>
             <tr><td><?php echo translate('OptionalEncoderParam') ?></td><td><textarea name="newMonitor[EncoderParameters]" rows="4" cols="36"><?php echo validHtmlStr($monitor->EncoderParameters()) ?></textarea></td></tr>