V2.0.14

1.命令行增加可选参数-v {1|0}，在所有输入媒体文件里，没有视频文件时，使用-v 1 参数合成的mp4文件仍然包含视频，-v 0则不含视频

@@ -116,4 +116,7 @@ V2.0.12
 
 
 V2.0.13
 V2.0.13
 1.命令行增加可选参数-r {0|1}，控制视频缩放后是否裁剪以适应目标区域
 1.命令行增加可选参数-r {0|1}，控制视频缩放后是否裁剪以适应目标区域
-2.命令行增加可选参数-k {0|1}，控制一对多时合成的视频是否保持4：3宽高比
+2.命令行增加可选参数-k {0|1}，控制一对多时合成的视频是否保持4：3宽高比
+
+V2.0.14
+1.命令行增加可选参数-v {1|0}，在所有输入媒体文件里，没有视频文件时，使用-v 1 参数合成的mp4文件仍然包含视频，-v 0则不含视频

@@ -16,6 +16,7 @@ bool keep_tmp_files = false;
 bool out_one_video = true;
 bool out_one_video = true;
 bool crop = false;
 bool crop = false;
 bool keep_4_3 = false;
 bool keep_4_3 = false;
+bool output_video = true;
 
 
 
 
 class fileinfo {
 class fileinfo {
@@ -1214,6 +1215,11 @@ int process_av_files(char * record_info, int piptype, bool one2one_same_size, in
 	if (one2one){
 	if (one2one){
 		k = true;
 		k = true;
 	}
 	}
+
+	if (output_video == true && max_video == 0){
+		max_video = 1;
+	}
+
 	CAVTranscoder videoTranscoder(one2one, one2one_same_size, one_to_many_inflat, width_teacher, height_teacher, width_student, height_student, has_teacher, max_audio, max_video, crop, k);
 	CAVTranscoder videoTranscoder(one2one, one2one_same_size, one_to_many_inflat, width_teacher, height_teacher, width_student, height_student, has_teacher, max_audio, max_video, crop, k);
 
 
 	int64_t cur_time = 0;
 	int64_t cur_time = 0;
@@ -1297,9 +1303,9 @@ int process_av_files(char * record_info, int piptype, bool one2one_same_size, in
 int main(int argc, char * argv[])
 int main(int argc, char * argv[])
 {
 {
 	if (argc < 2) {
 	if (argc < 2) {
-		printf("   merge_pip 2.0.13\n");
+		printf("   merge_pip 2.0.14\n");
 		printf("   merge video files to one pip video according to record info file,\nusage:");
 		printf("   merge video files to one pip video according to record info file,\nusage:");
-		printf("\n   %s record_info_filename [-t {0,1,2,3}]  [-c codec.cfg] [-s {1,0}] [-r {0,1}] [-k {0,1}]", argv[0]);
+		printf("\n   %s record_info_filename [-t {0,1,2,3}]  [-c codec.cfg] [-s {1,0}] [-r {0,1}] [-k {0,1}] [-v {1,0}]", argv[0]);
 		printf("\n\n");
 		printf("\n\n");
 		return -1;
 		return -1;
 	}
 	}
@@ -1356,6 +1362,14 @@ int main(int argc, char * argv[])
 			}
 			}
 			keep_4_3 = atoi(argv[i]);
 			keep_4_3 = atoi(argv[i]);
 		}
 		}
+		else if (!strcmp(argv[i], "-v")){
+			i++;
+			if (i > argc) {
+				printf("error,should be 1 or 0 after -v");
+				return -2;
+			}
+			output_video = atoi(argv[i]);
+		}
 	}
 	}