summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorPhilip Gladstone <philipjsg@users.sourceforge.net>2002-06-17 03:10:37 +0000
committerPhilip Gladstone <philipjsg@users.sourceforge.net>2002-06-17 03:10:37 +0000
commitcbadbf19fc8d4db35788a2de8af51de9f9d57578 (patch)
tree3c983b6cd677731b25726ff2cf27f506ddf35f57 /ffmpeg.c
parentc25fdfc683ce539e317b113909ae5f2493867d86 (diff)
Change ticker_tick to use ticker_abs as we want the absolute number
of ticks. In particular we want an INT64 return. Originally committed as revision 693 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 3e7348303d..7375b623d2 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1055,7 +1055,7 @@ static int av_encode(AVFormatContext **output_files,
switch(ist->st->codec.codec_type) {
case CODEC_TYPE_AUDIO:
//ist->pts = (INT64)1000000 * ist->sample_index / ist->st->codec.sample_rate;
- ist->pts = ticker_tick(&ist->pts_ticker, ist->sample_index);
+ ist->pts = ticker_abs(&ist->pts_ticker, ist->sample_index);
ist->sample_index += data_size / (2 * ist->st->codec.channels);
ist->pts_increment = (INT64) (data_size / (2 * ist->st->codec.channels)) * 1000000 / ist->st->codec.sample_rate;
break;
@@ -1063,7 +1063,7 @@ static int av_encode(AVFormatContext **output_files,
ist->frame_number++;
//ist->pts = ((INT64)ist->frame_number * 1000000 * FRAME_RATE_BASE) /
// ist->st->codec.frame_rate;
- ist->pts = ticker_tick(&ist->pts_ticker, ist->frame_number);
+ ist->pts = ticker_abs(&ist->pts_ticker, ist->frame_number);
ist->pts_increment = ((INT64) 1000000 * FRAME_RATE_BASE) /
ist->st->codec.frame_rate;
break;