Mercurial > libavformat.hg
comparison nutenc.c @ 6073:b9ddee1ca18c libavformat
Make write_header() and write_header() return an error code in case of
error.
author | stefano |
---|---|
date | Wed, 02 Jun 2010 21:57:35 +0000 |
parents | 0475ccdb762d |
children | 258c2ccc68b5 |
comparison
equal
deleted
inserted
replaced
6072:0475ccdb762d | 6073:b9ddee1ca18c |
---|---|
518 | 518 |
519 for (i=0; i < nut->avf->nb_streams; i++){ | 519 for (i=0; i < nut->avf->nb_streams; i++){ |
520 ret = url_open_dyn_buf(&dyn_bc); | 520 ret = url_open_dyn_buf(&dyn_bc); |
521 if(ret < 0) | 521 if(ret < 0) |
522 return ret; | 522 return ret; |
523 write_streamheader(avctx, dyn_bc, nut->avf->streams[i], i); | 523 if ((ret = write_streamheader(avctx, dyn_bc, nut->avf->streams[i], i)) < 0) |
524 return ret; | |
524 put_packet(nut, bc, dyn_bc, 1, STREAM_STARTCODE); | 525 put_packet(nut, bc, dyn_bc, 1, STREAM_STARTCODE); |
525 } | 526 } |
526 | 527 |
527 ret = url_open_dyn_buf(&dyn_bc); | 528 ret = url_open_dyn_buf(&dyn_bc); |
528 if(ret < 0) | 529 if(ret < 0) |
552 } | 553 } |
553 | 554 |
554 static int write_header(AVFormatContext *s){ | 555 static int write_header(AVFormatContext *s){ |
555 NUTContext *nut = s->priv_data; | 556 NUTContext *nut = s->priv_data; |
556 ByteIOContext *bc = s->pb; | 557 ByteIOContext *bc = s->pb; |
557 int i, j; | 558 int i, j, ret; |
558 | 559 |
559 nut->avf= s; | 560 nut->avf= s; |
560 | 561 |
561 nut->stream = av_mallocz(sizeof(StreamContext)*s->nb_streams); | 562 nut->stream = av_mallocz(sizeof(StreamContext)*s->nb_streams); |
562 nut->time_base= av_mallocz(sizeof(AVRational )*s->nb_streams); | 563 nut->time_base= av_mallocz(sizeof(AVRational )*s->nb_streams); |
592 assert(nut->frame_code['N'].flags == FLAG_INVALID); | 593 assert(nut->frame_code['N'].flags == FLAG_INVALID); |
593 | 594 |
594 put_buffer(bc, ID_STRING, strlen(ID_STRING)); | 595 put_buffer(bc, ID_STRING, strlen(ID_STRING)); |
595 put_byte(bc, 0); | 596 put_byte(bc, 0); |
596 | 597 |
597 write_headers(s, bc); | 598 if ((ret = write_headers(s, bc)) < 0) |
599 return ret; | |
598 | 600 |
599 put_flush_packet(bc); | 601 put_flush_packet(bc); |
600 | 602 |
601 //FIXME index | 603 //FIXME index |
602 | 604 |