From 3f1055346401c8f0bdf41aa336248dac542fb0b2 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 5 Jan 2019 18:32:53 -0500 Subject: [PATCH 1/2] Fix include path to Monitors.php --- web/includes/actions/console.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/includes/actions/console.php b/web/includes/actions/console.php index 5f02d655a..844e35566 100644 --- a/web/includes/actions/console.php +++ b/web/includes/actions/console.php @@ -25,7 +25,7 @@ if ( $action == 'delete' ) { } if ( isset($_REQUEST['markMids']) && !$user['MonitorIds'] ) { - require_once('Monitor.php'); + require_once('includes/Monitor.php'); foreach ( $_REQUEST['markMids'] as $markMid ) { if ( canEdit('Monitors', $markMid) ) { // This could be faster as a select all From b8bf91bec618db092c91499d5917d34f971c09ad Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 7 Jan 2019 09:20:58 -0500 Subject: [PATCH 2/2] include libswresample-ffmpeg1 in depends --- distros/ubuntu1604/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/ubuntu1604/control b/distros/ubuntu1604/control index d91fd4f53..415f54c9f 100644 --- a/distros/ubuntu1604/control +++ b/distros/ubuntu1604/control @@ -44,7 +44,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} ,javascript-common ,libmp4v2-2, libx264-142|libx264-148|libx264-152 ,libswscale-ffmpeg3|libswscale4|libswscale3|libswscale5 - ,libswresample2|libswresample3|libswresample24 + ,libswresample2|libswresample3|libswresample24|libswresample-ffmpeg1 ,ffmpeg | libav-tools ,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl ,libdbd-mysql-perl