diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-24 03:02:11 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-24 03:02:11 +0100 |
commit | 66244baf1dc866dc1a0b93ae542181b2779b6e93 (patch) | |
tree | eb3c477debc514242acbcc68165b2708d3cd200e | |
parent | d92073ac9346027de42fda9d934e47f5a2bc97e1 (diff) | |
download | ffmpeg-66244baf1dc866dc1a0b93ae542181b2779b6e93.tar.gz |
ffmpeg: fix mixed declarations and statements.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | ffmpeg.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -2775,6 +2775,7 @@ static int process_input(int file_index) } if(!ist->wrap_correction_done && is->start_time != AV_NOPTS_VALUE && ist->st->pts_wrap_bits < 64){ + int64_t stime, stime2; // Correcting starttime based on the enabled streams // FIXME this ideally should be done before the first use of starttime but we do not know which are the enabled streams at that point. // so we instead do it here as part of discontinuity handling @@ -2794,8 +2795,8 @@ static int process_input(int file_index) } } - int64_t stime = av_rescale_q(is->start_time, AV_TIME_BASE_Q, ist->st->time_base); - int64_t stime2= stime + (1ULL<<ist->st->pts_wrap_bits); + stime = av_rescale_q(is->start_time, AV_TIME_BASE_Q, ist->st->time_base); + stime2= stime + (1ULL<<ist->st->pts_wrap_bits); ist->wrap_correction_done = 1; if(stime2 > stime && pkt.dts != AV_NOPTS_VALUE && pkt.dts > stime + (1LL<<(ist->st->pts_wrap_bits-1))) { |