mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-29 02:33:04 +00:00
Make write_header() and write_headers() return an error code in case of
error. Originally committed as revision 23432 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
da9e6c4295
commit
fc0c41240e
@ -520,7 +520,8 @@ static int write_headers(AVFormatContext *avctx, ByteIOContext *bc){
|
|||||||
ret = url_open_dyn_buf(&dyn_bc);
|
ret = url_open_dyn_buf(&dyn_bc);
|
||||||
if(ret < 0)
|
if(ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
write_streamheader(avctx, dyn_bc, nut->avf->streams[i], i);
|
if ((ret = write_streamheader(avctx, dyn_bc, nut->avf->streams[i], i)) < 0)
|
||||||
|
return ret;
|
||||||
put_packet(nut, bc, dyn_bc, 1, STREAM_STARTCODE);
|
put_packet(nut, bc, dyn_bc, 1, STREAM_STARTCODE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -554,7 +555,7 @@ static int write_headers(AVFormatContext *avctx, ByteIOContext *bc){
|
|||||||
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;
|
ByteIOContext *bc = s->pb;
|
||||||
int i, j;
|
int i, j, ret;
|
||||||
|
|
||||||
nut->avf= s;
|
nut->avf= s;
|
||||||
|
|
||||||
@ -594,7 +595,8 @@ 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);
|
||||||
|
|
||||||
write_headers(s, bc);
|
if ((ret = write_headers(s, bc)) < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
put_flush_packet(bc);
|
put_flush_packet(bc);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user