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/nut.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/nut.c')
| -rw-r--r-- | libavformat/nut.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c index e4ca17d3d1..d5b213a1c3 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -511,8 +511,6 @@ static int nut_write_header(AVFormatContext *s) nut->stream = av_mallocz(sizeof(StreamContext)*s->nb_streams); - av_set_pts_info(s, 60, 1, AV_TIME_BASE); - /* main header */ put_be64(bc, MAIN_STARTCODE); put_packetheader(nut, bc, 120+5*256, 1); @@ -572,6 +570,7 @@ static int nut_write_header(AVFormatContext *s) int nom, denom, gcd; codec = &s->streams[i]->codec; + av_set_pts_info(s->streams[i], 60, 1, AV_TIME_BASE); put_be64(bc, STREAM_STARTCODE); put_packetheader(nut, bc, 120 + codec->extradata_size, 1); @@ -945,6 +944,8 @@ static int decode_stream_header(NUTContext *nut){ st = av_new_stream(s, stream_id); if (!st) return AVERROR_NOMEM; + av_set_pts_info(st, 60, 1, AV_TIME_BASE); + class = get_v(bc); tmp = get_vb(bc); st->codec.codec_tag= tmp; @@ -1069,8 +1070,6 @@ static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap) nut->avf= s; - av_set_pts_info(s, 60, 1, AV_TIME_BASE); - /* main header */ pos=0; for(;;){ |