胡斌

remove temp file,set version to 1.0.6

... ... @@ -473,8 +473,8 @@ int merge_audio_video(vector<media_info> & files)
if (audio.type_time - start_time > 0.1){
sprintf(audio_file, "%d_%d_silence.aac", nf, nsilence++);//a duration of silence
split_audio(silence_aac_file, 0, audio.type_time - start_time, audio_file);
merge_audio_files.push_back(silence_aac_file);
tmp_files.push_back(silence_aac_file);
merge_audio_files.push_back(audio_file);
tmp_files.push_back(audio_file);
}
if (audio.type_time - audio.start_time > 0.10 || audio_end.end_time - audio_end.type_time > 0.10) {
... ... @@ -494,14 +494,15 @@ int merge_audio_video(vector<media_info> & files)
if (video.end_time - audio_end.type_time > 0.1){
sprintf(audio_file, "%d_%d_silence.aac", nf, nsilence++);//a duration of silence
split_audio(silence_aac_file, 0, video.end_time - audio_end.type_time, audio_file);
merge_audio_files.push_back(silence_aac_file);
tmp_files.push_back(silence_aac_file);
merge_audio_files.push_back(audio_file);
tmp_files.push_back(audio_file);
}
}
}
sprintf(audio_file, "%d_merged.aac", nf);
merge_audio_file(merge_audio_files, audio_file);
tmp_files.push_back(audio_file);
sprintf(destfile, "%d.ts", nf);
... ... @@ -828,7 +829,7 @@ void load_codec_param()
int main(int argc, char * argv[])
{
if (argc < 2) {
printf(" merge_av 1.0.5\n");
printf(" merge_av 1.0.6\n");
printf(" run ffmpeg to merge audio and video files according to the record info file,\nusage:");
printf("\n %s record_info_filename [-p] [-k]", argv[0]);
printf("\n -p :only print the command,don't run ffmpeg");
... ...