diff --git a/upload/admin_area/lab_resources/experiments.php b/upload/admin_area/lab_resources/experiments.php index ccfdc375..be16ec9a 100644 --- a/upload/admin_area/lab_resources/experiments.php +++ b/upload/admin_area/lab_resources/experiments.php @@ -95,7 +95,7 @@ if(isset($_POST['experiment'])) $msg[] = "
".nl2br($width); $msg[] = "
".nl2br($v_bitrate); $msg[] = "
".nl2br($a_bitrate); - $msg[] = "
".nl2br(shell_output($Cbucket->configs['ffmpegpath'].' -i '.$victimFile." -vcodec libx264 -acodec libfaac -s ".$width."x".$height." -preset ".$preset." -f mp4 -b:v ".$v_bitrate." -b:a ".$a_bitrate." -r 25 -ar 22050 ".TEMP_DIR."/".$t."121.mp4")); + $msg[] = "
".nl2br(shell_output($Cbucket->configs['ffmpegpath'].' -i '.$victimFile." -vcodec libx264 -acodec ".config('audio_codec')." -s ".$width."x".$height." -preset ".$preset." -f mp4 -b:v ".$v_bitrate." -b:a ".$a_bitrate." -r 25 -ar 22050 ".TEMP_DIR."/".$t."121.mp4")); $msg[] = "
Video file is convertable..
"; } @@ -116,7 +116,7 @@ if(isset($_POST['experiment'])) $msg[] = "
".nl2br($width); $msg[] = "
".nl2br($v_bitrate); $msg[] = "
".nl2br($a_bitrate); - $msg[] = "
".nl2br(shell_output($Cbucket->configs['ffmpegpath'].' -i '.$victimFile." -vcodec libx264 -acodec libfaac -s ".$width."x".$height." -preset ".$preset." -f mp4 -b:v ".$v_bitrate." -b:a ".$a_bitrate." -r 25 -ar 22050 ".TEMP_DIR."/".$t."121.mp4")); + $msg[] = "
".nl2br(shell_output($Cbucket->configs['ffmpegpath'].' -i '.$victimFile." -vcodec libx264 -acodec ".config('audio_codec')." -s ".$width."x".$height." -preset ".$preset." -f mp4 -b:v ".$v_bitrate." -b:a ".$a_bitrate." -r 25 -ar 22050 ".TEMP_DIR."/".$t."121.mp4")); $msg[] = "
Video file is convertable..
"; } else diff --git a/upload/includes/classes/conversion/ffmpeg.class.php b/upload/includes/classes/conversion/ffmpeg.class.php index fc096945..4866d5b5 100644 --- a/upload/includes/classes/conversion/ffmpeg.class.php +++ b/upload/includes/classes/conversion/ffmpeg.class.php @@ -1,5 +1,6 @@