aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpegts.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/mpegts.c
parente8733cc4d9b866643009342ec6839795a059fe53 (diff)
downloadffmpeg-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/mpegts.c')
-rw-r--r--libavformat/mpegts.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 4a51b21c45..a7c442753a 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -768,6 +768,7 @@ static void mpegts_push_data(void *opaque,
}
st = av_new_stream(pes->stream, pes->pid);
if (st) {
+ av_set_pts_info(st, 60, 1, 27000000);
st->priv_data = pes;
st->codec.codec_type = codec_type;
st->codec.codec_id = codec_id;
@@ -1165,14 +1166,12 @@ static int mpegts_read_header(AVFormatContext *s,
uint8_t packet[TS_PACKET_SIZE];
/* only read packets */
-
- s->pts_num = 1;
- s->pts_den = 27000000;
do_pcr:
st = av_new_stream(s, 0);
if (!st)
goto fail;
+ av_set_pts_info(st, 60, 1, 27000000);
st->codec.codec_type = CODEC_TYPE_DATA;
st->codec.codec_id = CODEC_ID_MPEG2TS;