修复bug

yangjie10930 · Nov 20, 2017 · de20923 · de20923
1 parent f83d53e
commit de20923
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![](https://img.shields.io/badge/minSdkVersion-16-green.svg)](https://developer.android.google.cn) [![](https://img.shields.io/badge/FFmpeg-3.3.4-orange.svg)](https://ffmpeg.org/download.html#release_3.3) [![](https://img.shields.io/badge/release-v0.9-blue.svg)](https://github.com/yangjie10930/EpMedia)
+[![](https://img.shields.io/badge/minSdkVersion-16-green.svg)](https://developer.android.google.cn) [![](https://img.shields.io/badge/FFmpeg-3.3.4-orange.svg)](https://ffmpeg.org/download.html#release_3.3) [![](https://img.shields.io/badge/release-v0.9.1-blue.svg)](https://github.com/yangjie10930/EpMedia)
 
 # EpMedia
 基于FFmpeg开发的视频处理框架，简单易用，体积小，帮助使用者快速实现视频处理功能。包含以下功能：剪辑，裁剪，旋转，镜像，合并，分离，添加LOGO，添加滤镜，添加背景音乐。</br>
@@ -20,7 +20,7 @@ allprojects {
 ```
 * 添加gradle依赖:
 ```Java
-compile 'com.github.yangjie10930:EpMedia:v0.9'
+compile 'com.github.yangjie10930:EpMedia:v0.9.1'
 ```
 ## 单个视频处理:
 * 创建待处理视频:

diff --git a/joevideolib/src/main/java/VideoHandle/EpEditor.java b/joevideolib/src/main/java/VideoHandle/EpEditor.java
@@ -107,7 +107,9 @@ public void exec(EpVideo epVideo, OutputOption outputOption, OnEditorListener on
 					isFilter = true;
 				}
 			}
-			cmd.append(filter_complex.toString());
+			if(!filter_complex.toString().equals("")) {
+				cmd.append(filter_complex.toString());
+			}
 		}
 
 		//输出选项
@@ -223,7 +225,9 @@ public void merge(List<EpVideo> epVideos, OutputOption outputOption, OnEditorLis
 				}
 				filter_complex.append("concat=n=").append(epVideos.size()).append(":v=0:a=1[outa]");
 			}
-			cmd.append(filter_complex.toString());
+			if(!filter_complex.toString().equals("")) {
+				cmd.append(filter_complex.toString());
+			}
 			cmd.append("-map").append("[outv]");
 			if (!isNoAudioTrack) {
 				cmd.append("-map").append("[outa]");
@@ -487,6 +491,9 @@ public void run() {
 	 */
 	public void execCmd(CmdList cmd, long duration, final OnEditorListener onEditorListener) {
 		String[] cmds = cmd.toArray(new String[cmd.size()]);
+		for (String ss:cmds) {
+			Log.v("EpMediaF","cmd:"+ss);
+		}
 		FFmpegCmd.exec(cmds, duration, new OnEditorListener() {
 			@Override
 			public void onSuccess() {