summaryrefslogtreecommitdiff
path: root/libav
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 /libav
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 'libav')
-rw-r--r--libav/asf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libav/asf.c b/libav/asf.c
index a536549940..8dac626ebc 100644
--- a/libav/asf.c
+++ b/libav/asf.c
@@ -578,11 +578,11 @@ static int asf_write_packet(AVFormatContext *s, int stream_index,
stream = &asf->streams[stream_index];
if (codec->codec_type == CODEC_TYPE_AUDIO) {
- timestamp = (int)ticker_tick(&stream->pts_ticker, codec->frame_number);
+ timestamp = (int)ticker_abs(&stream->pts_ticker, codec->frame_number);
duration = (codec->frame_number * codec->frame_size * INT64_C(10000000)) /
codec->sample_rate;
} else {
- timestamp = (int)ticker_tick(&stream->pts_ticker, codec->frame_number);
+ timestamp = (int)ticker_abs(&stream->pts_ticker, codec->frame_number);
duration = codec->frame_number *
((INT64_C(10000000) * FRAME_RATE_BASE) / codec->frame_rate);
}