small API updates to use int instead of string

Author: n8fr8

src/org/ffmpeg/android/FfmpegController.java

@@ -571,7 +571,7 @@ public MediaDesc convertToMP4Stream (MediaDesc mediaIn, String outPath, ShellCal
 	}
 
 
-	public MediaDesc convertToWaveAudio (MediaDesc mediaIn, String outPath, String sampleRate, int channels, ShellCallback sc) throws Exception
+	public MediaDesc convertToWaveAudio (MediaDesc mediaIn, String outPath, int sampleRate, int channels, ShellCallback sc) throws Exception
 	{
 		ArrayList<String> cmd = new ArrayList<String>();
 
@@ -593,7 +593,7 @@ public MediaDesc convertToWaveAudio (MediaDesc mediaIn, String outPath, String s
 		}
 
 		cmd.add("-ar");
-		cmd.add(sampleRate);
+		cmd.add(sampleRate + "");
 
 		cmd.add("-ac");
 		cmd.add(channels + "");
@@ -766,7 +766,9 @@ public void concatAndTrimFilesMPEG (ArrayList<MediaDesc> videos,MediaDesc out, b
 				cmd.add ("-vcodec");
 				cmd.add("mpeg2video");
 				*/
-				//cmd.add("-an"); //no audio
+				
+				if (out.audioCodec == null)
+					cmd.add("-an"); //no audio
 
 				//cmd.add("-strict");
 				//cmd.add("experimental");