From f63144539ec44fde26969b4315a17bc9fe95d72c Mon Sep 17 00:00:00 2001
From: Fahad Abbas <fahad.dev@iu.com.pk>
Date: Tue, 8 Mar 2016 17:57:57 +0500
Subject: [PATCH] modified : Fixed a bit of errors

---
 upload/admin_area/lab_resources/experiments.php     | 4 ++--
 upload/includes/classes/conversion/ffmpeg.class.php | 1 +
 upload/includes/functions.php                       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

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[] = "<br>".nl2br($width);
 				$msg[] = "<br>".nl2br($v_bitrate);
 				$msg[] = "<br>".nl2br($a_bitrate);
-				$msg[] = "<br>".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[] = "<br>".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[] = "<div class=\"expOK\">Video file is convertable..</div>";
 				
 			}
@@ -116,7 +116,7 @@ if(isset($_POST['experiment']))
 				$msg[] = "<br>".nl2br($width);
 				$msg[] = "<br>".nl2br($v_bitrate);
 				$msg[] = "<br>".nl2br($a_bitrate);
-				$msg[] = "<br>".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[] = "<br>".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[] = "<div class=\"expOK\">Video file is convertable..</div>";
 			}
 			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 @@
 <?php
 define('FFMPEG_BINARY', get_binaries('ffmpeg'));
+define('MP4Box_BINARY', get_binaries('mp4box'));
 define('MEDIAINFO_BINARY', get_binaries('media_info'));
 define('FFPROBE', get_binaries('ffprobe_path'));
 
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 62402337..88b41cf4 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -3657,7 +3657,7 @@
 			case 'ffmpeg':
 			{
 				//Gett FFMPEG SVN version
-				dump($result);
+				//dump($result);
 				preg_match("/svn-r([0-9]+)/i",strtolower($result),$matches);
 				//pr($matches);
 				if(is_numeric(floatval($matches[1])) && $matches[1]) {