Mercurial > libavformat.hg
comparison nut.c @ 462:b69898ffc92a libavformat
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
author | michael |
---|---|
date | Fri, 21 May 2004 20:43:21 +0000 |
parents | 63540e5504f7 |
children | 696f41bc8784 |
comparison
equal
deleted
inserted
replaced
461:63540e5504f7 | 462:b69898ffc92a |
---|---|
509 nut->avf= s; | 509 nut->avf= s; |
510 | 510 |
511 nut->stream = | 511 nut->stream = |
512 av_mallocz(sizeof(StreamContext)*s->nb_streams); | 512 av_mallocz(sizeof(StreamContext)*s->nb_streams); |
513 | 513 |
514 av_set_pts_info(s, 60, 1, AV_TIME_BASE); | |
515 | |
516 /* main header */ | 514 /* main header */ |
517 put_be64(bc, MAIN_STARTCODE); | 515 put_be64(bc, MAIN_STARTCODE); |
518 put_packetheader(nut, bc, 120+5*256, 1); | 516 put_packetheader(nut, bc, 120+5*256, 1); |
519 put_v(bc, 2); /* version */ | 517 put_v(bc, 2); /* version */ |
520 put_v(bc, s->nb_streams); | 518 put_v(bc, s->nb_streams); |
570 for (i = 0; i < s->nb_streams; i++) | 568 for (i = 0; i < s->nb_streams; i++) |
571 { | 569 { |
572 int nom, denom, gcd; | 570 int nom, denom, gcd; |
573 | 571 |
574 codec = &s->streams[i]->codec; | 572 codec = &s->streams[i]->codec; |
573 av_set_pts_info(s->streams[i], 60, 1, AV_TIME_BASE); | |
575 | 574 |
576 put_be64(bc, STREAM_STARTCODE); | 575 put_be64(bc, STREAM_STARTCODE); |
577 put_packetheader(nut, bc, 120 + codec->extradata_size, 1); | 576 put_packetheader(nut, bc, 120 + codec->extradata_size, 1); |
578 put_v(bc, i /*s->streams[i]->index*/); | 577 put_v(bc, i /*s->streams[i]->index*/); |
579 put_v(bc, (codec->codec_type == CODEC_TYPE_AUDIO) ? 32 : 0); | 578 put_v(bc, (codec->codec_type == CODEC_TYPE_AUDIO) ? 32 : 0); |
943 return -1; | 942 return -1; |
944 | 943 |
945 st = av_new_stream(s, stream_id); | 944 st = av_new_stream(s, stream_id); |
946 if (!st) | 945 if (!st) |
947 return AVERROR_NOMEM; | 946 return AVERROR_NOMEM; |
947 av_set_pts_info(st, 60, 1, AV_TIME_BASE); | |
948 | |
948 class = get_v(bc); | 949 class = get_v(bc); |
949 tmp = get_vb(bc); | 950 tmp = get_vb(bc); |
950 st->codec.codec_tag= tmp; | 951 st->codec.codec_tag= tmp; |
951 switch(class) | 952 switch(class) |
952 { | 953 { |
1067 int64_t pos; | 1068 int64_t pos; |
1068 int inited_stream_count; | 1069 int inited_stream_count; |
1069 | 1070 |
1070 nut->avf= s; | 1071 nut->avf= s; |
1071 | 1072 |
1072 av_set_pts_info(s, 60, 1, AV_TIME_BASE); | |
1073 | |
1074 /* main header */ | 1073 /* main header */ |
1075 pos=0; | 1074 pos=0; |
1076 for(;;){ | 1075 for(;;){ |
1077 pos= find_startcode(bc, MAIN_STARTCODE, pos)+1; | 1076 pos= find_startcode(bc, MAIN_STARTCODE, pos)+1; |
1078 if (pos<0){ | 1077 if (pos<0){ |