Skip to content
This repository was archived by the owner on May 30, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
Binary file modified res/raw/ffmpeg
Binary file not shown.
Binary file modified res/raw/sox
Binary file not shown.
5 changes: 3 additions & 2 deletions src/org/ffmpeg/android/FfmpegController.java
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,9 @@ public Clip trim (Clip mediaIn, boolean withSound, String outPath, ShellCallback

cmd.add(mFfmpegBin);
cmd.add("-y");

cmd.add("-i");
cmd.add(mediaPath);

if (mediaIn.startTime != null)
{
Expand All @@ -1087,8 +1090,6 @@ public Clip trim (Clip mediaIn, boolean withSound, String outPath, ShellCallback

}

cmd.add("-i");
cmd.add(mediaPath);

if (!withSound)
cmd.add("-an");
Expand Down