diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-04-30 21:43:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-04-30 21:43:59 +0000 |
| commit | c0df9d75bd9a3170a793eb1651354076360998e8 (patch) | |
| tree | 0f4c75f07fc395d168bf0a7fcd92d6f9d9e9281b /libavformat/asf.c | |
| parent | b7782b47c95c26d674df134973d1403e80fe9767 (diff) | |
| download | ffmpeg-c0df9d75bd9a3170a793eb1651354076360998e8.tar.gz | |
switch to native time bases
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/asf.c')
| -rw-r--r-- | libavformat/asf.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index d88a840ee9..4a480bf45c 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -196,9 +196,9 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) if (!asf_st) goto fail; st->priv_data = asf_st; - st->start_time = asf->hdr.preroll * (int64_t)AV_TIME_BASE / 1000; + st->start_time = asf->hdr.preroll; st->duration = asf->hdr.send_time / - (10000000 / AV_TIME_BASE) - st->start_time; + (10000000 / 1000) - st->start_time; get_guid(pb, &g); if (!memcmp(&g, &audio_stream, sizeof(GUID))) { type = CODEC_TYPE_AUDIO; @@ -217,9 +217,6 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) get_le32(pb); st->codec.codec_type = type; - /* 1 fps default (XXX: put 0 fps instead) */ - st->codec.frame_rate = 1000; - st->codec.frame_rate_base = 1; if (type == CODEC_TYPE_AUDIO) { get_wav_header(pb, &st->codec, type_specific_size); st->need_parsing = 1; |