aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalcium <calcium@nurs.or.jp>2005-03-23 21:07:11 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-03-23 21:07:11 +0000
commitb691166c0f1956280105d8dc2abe7f3321728f46 (patch)
tree2c40b1e33e4e3d104918c98ce78f7f668de29964
parent3ed4046fadce3efdc53c26e623b3ee6697e3dcdc (diff)
downloadffmpeg-b691166c0f1956280105d8dc2abe7f3321728f46.tar.gz
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
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index bbcf998519..ebe2400574 100644
--- a/ffmpeg.c
+++ b/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));
#endif
/* 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) {
switch(ost->st->codec.codec_type) {