mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
25_fix_problem_that_unsynced_with_ss_option.patch by (Calcium | calcium nurs or jp)
Originally committed as revision 4076 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
3ed4046fad
commit
b691166c0f
2
ffmpeg.c
2
ffmpeg.c
@ -1264,7 +1264,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
|
|||||||
((double)ost->st->pts.val * ost->st->time_base.num / ost->st->time_base.den));
|
((double)ost->st->pts.val * ost->st->time_base.num / ost->st->time_base.den));
|
||||||
#endif
|
#endif
|
||||||
/* set the input output pts pairs */
|
/* set the input output pts pairs */
|
||||||
ost->sync_ipts = (double)(ist->pts + input_files_ts_offset[ist->file_index])/ AV_TIME_BASE;
|
ost->sync_ipts = (double)(ist->pts + input_files_ts_offset[ist->file_index] - start_time)/ AV_TIME_BASE;
|
||||||
|
|
||||||
if (ost->encoding_needed) {
|
if (ost->encoding_needed) {
|
||||||
switch(ost->st->codec.codec_type) {
|
switch(ost->st->codec.codec_type) {
|
||||||
|
Loading…
Reference in New Issue
Block a user