胡斌

fix bug of time stamp

@@ -477,9 +477,9 @@ int merge_audio_video(vector<media_info> & files) @@ -477,9 +477,9 @@ int merge_audio_video(vector<media_info> & files)
477 tmp_files.push_back(silence_aac_file); 477 tmp_files.push_back(silence_aac_file);
478 } 478 }
479 479
480 - if (audio.type_time - audio.start_time > 0.10 || audio_end.end_time - audio.type_time > 0.10) { 480 + if (audio.type_time - audio.start_time > 0.10 || audio_end.end_time - audio_end.type_time > 0.10) {
481 sprintf(audio_file, "%d_%s", nf, audio.name.c_str()); 481 sprintf(audio_file, "%d_%s", nf, audio.name.c_str());
482 - split_audio(audio.name.c_str(), audio.type_time - audio.start_time, audio_end.type_time - audio.start_time, audio_file); 482 + split_audio(audio.name.c_str(), audio.type_time - audio.start_time, audio_end.type_time - audio.type_time, audio_file);
483 tmp_files.push_back(audio_file); 483 tmp_files.push_back(audio_file);
484 484
485 } 485 }
@@ -517,9 +517,9 @@ int merge_audio_pic(vector<media_info> & files) @@ -517,9 +517,9 @@ int merge_audio_pic(vector<media_info> & files)
517 media_info audio = files[0]; 517 media_info audio = files[0];
518 media_info audio_end = files[1]; 518 media_info audio_end = files[1];
519 519
520 - if (audio.type_time - audio.start_time > 0.10 || audio_end.end_time - audio.type_time > 0.10) { 520 + if (audio.type_time - audio.start_time > 0.10 || audio_end.end_time - audio_end.type_time > 0.10) {
521 sprintf(audio_file, "%d_%s", nf, audio.name.c_str()); 521 sprintf(audio_file, "%d_%s", nf, audio.name.c_str());
522 - split_audio(audio.name.c_str(), audio.type_time - audio.start_time, audio_end.type_time - audio.start_time, audio_file); 522 + split_audio(audio.name.c_str(), audio.type_time - audio.start_time, audio_end.type_time - audio.type_time, audio_file);
523 tmp_files.push_back(audio_file); 523 tmp_files.push_back(audio_file);
524 } 524 }
525 else{ 525 else{