summaryrefslogtreecommitdiff
path: root/libavformat/idroq.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-05-21 20:43:21 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-05-21 20:43:21 +0000
commit9ee91c2f53dbc7cc61e65805d57e0a805b5752d7 (patch)
tree8b9419fb7d80a440bacf3d2783b3599648ee1c3d /libavformat/idroq.c
parente8733cc4d9b866643009342ec6839795a059fe53 (diff)
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/idroq.c')
-rw-r--r--libavformat/idroq.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libavformat/idroq.c b/libavformat/idroq.c
index 7d782c2d04..bb074d55f1 100644
--- a/libavformat/idroq.c
+++ b/libavformat/idroq.c
@@ -84,10 +84,6 @@ static int roq_read_header(AVFormatContext *s,
roq->framerate = LE_16(&preamble[6]);
roq->frame_pts_inc = 90000 / roq->framerate;
- /* set the pts reference (1 pts = 1/90000) */
- s->pts_num = 1;
- s->pts_den = 90000;
-
/* init private context parameters */
roq->width = roq->height = roq->audio_channels = roq->video_pts =
roq->audio_frame_count = 0;
@@ -146,6 +142,8 @@ static int roq_read_header(AVFormatContext *s,
st = av_new_stream(s, 0);
if (!st)
return AVERROR_NOMEM;
+ /* set the pts reference (1 pts = 1/90000) */
+ av_set_pts_info(st, 33, 1, 90000);
roq->video_stream_index = st->index;
st->codec.codec_type = CODEC_TYPE_VIDEO;
st->codec.codec_id = CODEC_ID_ROQ;
@@ -157,6 +155,7 @@ static int roq_read_header(AVFormatContext *s,
st = av_new_stream(s, 0);
if (!st)
return AVERROR_NOMEM;
+ av_set_pts_info(st, 33, 1, 90000);
roq->audio_stream_index = st->index;
st->codec.codec_type = CODEC_TYPE_AUDIO;
st->codec.codec_id = CODEC_ID_ROQ_DPCM;