From 1596ab3421dc8c3f39959f311eda4135af650a1d Mon Sep 17 00:00:00 2001 From: towards_a_new_leftypol Date: Mon, 19 Oct 2020 22:57:50 -0400 Subject: [PATCH] remove ffmpeg_path from cfg --- inc/config.php | 2 +- inc/instance-config.php | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/inc/config.php b/inc/config.php index 640ca418..d9b7f35c 100644 --- a/inc/config.php +++ b/inc/config.php @@ -1129,7 +1129,7 @@ $config['error']['webmerror'] = _('There was a problem processing your webm.');//Is this error used anywhere ? $config['error']['invalidwebm'] = _('Invalid webm uploaded.'); $config['error']['webmhasaudio'] = _('The uploaded webm contains an audio or another type of additional stream.'); - $config['error']['webmtoolong'] = _('The uploaded webm is longer than ' . $config['webm']['max_length'] . ' seconds.'); + $config['error']['webmtoolong'] = _('The uploaded webm is longer than ' . $config['webm']['max_length'] . ' seconds.'); // note that this will sub the initial value from this file, not instance-config.php $config['error']['fileexists'] = _('That file already exists!'); $config['error']['fileexistsinthread'] = _('That file already exists in this thread!'); $config['error']['delete_too_soon'] = _('You\'ll have to wait another %s before deleting that.'); diff --git a/inc/instance-config.php b/inc/instance-config.php index 8d86ff4b..c5e7090c 100644 --- a/inc/instance-config.php +++ b/inc/instance-config.php @@ -54,7 +54,7 @@ $config['max_height'] = 10000; $config['max_images'] = 4; $config['threads_per_page'] = 10; - $config['max_pages'] = 10; + $config['max_pages'] = 50; $config['threads_preview'] = 5; $config['root'] = '/'; $config['secure_trip_salt'] = 'MzdhNTJiMjNkMTM5Nzc5NDcwOGViMD'; @@ -81,10 +81,6 @@ $config['additional_javascript'][] = 'js/webm-settings.js'; $config['additional_javascript'][] = 'js/expand-video.js'; $config['max_filesize'] = 50 * 1024 * 1024; // 50MB - $config['webm']['ffmpeg_path'] = '/usr/bin/ffmpeg'; - $config['webm']['ffprobe_path'] = '/usr/bin/ffprobe'; - $config['mp4']['ffmpeg_path'] = '/usr/bin/ffmpeg'; - $config['mp4']['ffprobe_path'] = '/usr/bin/ffprobe'; $config['webm']['allow_audio'] = true; $config['webm']['max_length'] = 620; //end test section