[FFmpeg-cvslog] ffmpeg: Don't unnecessarily convert ipts to a double.
Alex Converse
git at videolan.org
Tue Aug 30 18:15:01 CEST 2011
ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Tue Aug 30 04:45:46 2011 +0200| [dadbebbbbca0b0dc42c437b2d425277d2bdd896f] | committer: Michael Niedermayer
ffmpeg: Don't unnecessarily convert ipts to a double.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dadbebbbbca0b0dc42c437b2d425277d2bdd896f
---
ffmpeg.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 274bdc6..c61eed6 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2309,11 +2309,11 @@ static int transcode(AVFormatContext **output_files,
for(; received_sigterm == 0;) {
int file_index, ist_index;
AVPacket pkt;
- double ipts_min;
+ int64_t ipts_min;
double opts_min;
redo:
- ipts_min= 1e100;
+ ipts_min= INT64_MAX;
opts_min= 1e100;
/* if 'q' pressed, exits */
if (!using_stdin) {
@@ -2393,14 +2393,15 @@ static int transcode(AVFormatContext **output_files,
smallest output pts */
file_index = -1;
for(i=0;i<nb_ostreams;i++) {
- double ipts, opts;
+ int64_t ipts;
+ double opts;
ost = ost_table[i];
os = output_files[ost->file_index];
ist = &input_streams[ost->source_index];
if(ist->is_past_recording_time || no_packet[ist->file_index])
continue;
opts = ost->st->pts.val * av_q2d(ost->st->time_base);
- ipts = (double)ist->pts;
+ ipts = ist->pts;
if (!input_files[ist->file_index].eof_reached){
if(ipts < ipts_min) {
ipts_min = ipts;
More information about the ffmpeg-cvslog
mailing list