0
/
leftypol_lainchan
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

remove ffmpeg_path from cfg

This commit is contained in:
towards_a_new_leftypol 2020-10-19 22:57:50 -04:00 committed by towards-a-new-leftypol
parent c595bfbabd
commit 1596ab3421
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/config.php
View File

@ -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 <a href="%s">already exists</a>!');
$config['error']['fileexistsinthread'] = _('That file <a href="%s">already exists</a> in this thread!');
$config['error']['delete_too_soon'] = _('You\'ll have to wait another %s before deleting that.');

6
inc/instance-config.php
View File

@ -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