move header writing into its own function

Originally committed as revision 10034 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 18 years ago
parent 7a26da44b0
commit 7e506494b1
  1. 37
      libavformat/nutenc.c

@ -311,10 +311,28 @@ static int write_streamheader(NUTContext *nut, ByteIOContext *bc, AVCodecContext
return 0; return 0;
} }
static void write_headers(NUTContext *nut, ByteIOContext *bc){
ByteIOContext dyn_bc;
int i;
put_be64(bc, MAIN_STARTCODE);
url_open_dyn_buf(&dyn_bc);
write_mainheader(nut, &dyn_bc);
put_packet(nut, bc, &dyn_bc, 1);
for (i=0; i < nut->avf->nb_streams; i++){
AVCodecContext *codec = nut->avf->streams[i]->codec;
put_be64(bc, STREAM_STARTCODE);
url_open_dyn_buf(&dyn_bc);
write_streamheader(nut, &dyn_bc, codec, i);
put_packet(nut, bc, &dyn_bc, 1);
}
}
static int write_header(AVFormatContext *s){ static int write_header(AVFormatContext *s){
NUTContext *nut = s->priv_data; NUTContext *nut = s->priv_data;
ByteIOContext *bc = &s->pb, dyn_bc; ByteIOContext *bc = &s->pb;
AVCodecContext *codec;
int i, j; int i, j;
nut->avf= s; nut->avf= s;
@ -353,20 +371,7 @@ static int write_header(AVFormatContext *s){
put_buffer(bc, ID_STRING, strlen(ID_STRING)); put_buffer(bc, ID_STRING, strlen(ID_STRING));
put_byte(bc, 0); put_byte(bc, 0);
/* main header */ write_headers(nut, bc);
put_be64(bc, MAIN_STARTCODE);
url_open_dyn_buf(&dyn_bc);
write_mainheader(nut, &dyn_bc);
put_packet(nut, bc, &dyn_bc, 1);
for (i=0; i < s->nb_streams; i++){
codec = s->streams[i]->codec;
put_be64(bc, STREAM_STARTCODE);
url_open_dyn_buf(&dyn_bc);
write_streamheader(nut, &dyn_bc, codec, i);
put_packet(nut, bc, &dyn_bc, 1);
}
put_flush_packet(bc); put_flush_packet(bc);

Loading…
Cancel
Save