Commit 517fe644 authored by Marton Balint's avatar Marton Balint

avformat/mux: do not call write_header multiple times if it fails the first time

Signed-off-by: 's avatarMarton Balint <cus@passwd.hu>
parent b577d421
...@@ -124,6 +124,7 @@ struct AVFormatInternal { ...@@ -124,6 +124,7 @@ struct AVFormatInternal {
* Whether or not a header has already been written * Whether or not a header has already been written
*/ */
int header_written; int header_written;
int write_header_ret;
}; };
struct AVStreamInternal { struct AVStreamInternal {
......
...@@ -479,6 +479,7 @@ static int write_header_internal(AVFormatContext *s) ...@@ -479,6 +479,7 @@ static int write_header_internal(AVFormatContext *s)
int ret = s->oformat->write_header(s); int ret = s->oformat->write_header(s);
if (ret >= 0 && s->pb && s->pb->error < 0) if (ret >= 0 && s->pb && s->pb->error < 0)
ret = s->pb->error; ret = s->pb->error;
s->internal->write_header_ret = ret;
if (ret < 0) if (ret < 0)
return ret; return ret;
if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS) if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS)
...@@ -713,7 +714,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -713,7 +714,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
did_split = av_packet_split_side_data(pkt); did_split = av_packet_split_side_data(pkt);
if (!s->internal->header_written) { if (!s->internal->header_written) {
ret = write_header_internal(s); ret = s->internal->write_header_ret ? s->internal->write_header_ret : write_header_internal(s);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
} }
...@@ -1152,7 +1153,7 @@ int av_write_trailer(AVFormatContext *s) ...@@ -1152,7 +1153,7 @@ int av_write_trailer(AVFormatContext *s)
} }
if (!s->internal->header_written) { if (!s->internal->header_written) {
ret = write_header_internal(s); ret = s->internal->write_header_ret ? s->internal->write_header_ret : write_header_internal(s);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment