胡斌

set version to 1.2.0

@@ -1132,7 +1132,7 @@ void get_outinfo_file_name(char * input) @@ -1132,7 +1132,7 @@ void get_outinfo_file_name(char * input)
1132 int main(int argc, char * argv[]) 1132 int main(int argc, char * argv[])
1133 { 1133 {
1134 if (argc < 2) { 1134 if (argc < 2) {
1135 - printf(" merge_av 1.1.0\n"); 1135 + printf(" merge_av 1.2.0\n");
1136 printf(" run ffmpeg to merge audio and video files according to the record info file,\nusage:"); 1136 printf(" run ffmpeg to merge audio and video files according to the record info file,\nusage:");
1137 printf("\n %s record_info_filename [-p] [-k]", argv[0]); 1137 printf("\n %s record_info_filename [-p] [-k]", argv[0]);
1138 printf("\n -p :only print the command,don't run ffmpeg"); 1138 printf("\n -p :only print the command,don't run ffmpeg");