diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-05-21 20:43:21 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-05-21 20:43:21 +0000 |
| commit | 9ee91c2f53dbc7cc61e65805d57e0a805b5752d7 (patch) | |
| tree | 8b9419fb7d80a440bacf3d2783b3599648ee1c3d /libavformat/westwood.c | |
| parent | e8733cc4d9b866643009342ec6839795a059fe53 (diff) | |
| download | ffmpeg-9ee91c2f53dbc7cc61e65805d57e0a805b5752d7.tar.gz | |
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
Originally committed as revision 3148 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/westwood.c')
| -rw-r--r-- | libavformat/westwood.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libavformat/westwood.c b/libavformat/westwood.c index 5d0848cec1..44523694f5 100644 --- a/libavformat/westwood.c +++ b/libavformat/westwood.c @@ -131,14 +131,11 @@ static int wsaud_read_header(AVFormatContext *s, /* flag 1 indicates 16 bit audio */ wsaud->audio_bits = (((header[10] & 0x2) >> 1) + 1) * 8; - /* set the pts reference the same as the sample rate */ - s->pts_num = 1; - s->pts_den = wsaud->audio_samplerate; - /* initialize the audio decoder stream */ st = av_new_stream(s, 0); if (!st) return AVERROR_NOMEM; + av_set_pts_info(st, 33, 1, wsaud->audio_samplerate); st->codec.codec_type = CODEC_TYPE_AUDIO; st->codec.codec_id = wsaud->audio_type; st->codec.codec_tag = 0; /* no tag */ @@ -222,14 +219,11 @@ static int wsvqa_read_header(AVFormatContext *s, unsigned int chunk_tag; unsigned int chunk_size; - /* set the pts reference (1 pts = 1/90000) */ - s->pts_num = 1; - s->pts_den = 90000; - /* initialize the video decoder stream */ st = av_new_stream(s, 0); if (!st) return AVERROR_NOMEM; + av_set_pts_info(st, 33, 1, 90000); wsvqa->video_stream_index = st->index; st->codec.codec_type = CODEC_TYPE_VIDEO; st->codec.codec_id = CODEC_ID_WS_VQA; @@ -255,6 +249,7 @@ static int wsvqa_read_header(AVFormatContext *s, st = av_new_stream(s, 0); if (!st) return AVERROR_NOMEM; + av_set_pts_info(st, 33, 1, 90000); st->codec.codec_type = CODEC_TYPE_AUDIO; st->codec.codec_id = CODEC_ID_ADPCM_IMA_WS; st->codec.codec_tag = 0; /* no tag */ |