return 0;
}
+static int write_header_internal(AVFormatContext *s)
+{
+ if (s->oformat->write_header) {
+ int ret = s->oformat->write_header(s);
+ if (ret >= 0 && s->pb && s->pb->error < 0)
+ ret = s->pb->error;
+ if (ret < 0)
+ return ret;
+ if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS)
+ avio_flush(s->pb);
+ }
+ s->internal->header_written = 1;
+ return 0;
+}
+
int avformat_write_header(AVFormatContext *s, AVDictionary **options)
{
int ret = 0;
if ((ret = init_muxer(s, options)) < 0)
return ret;
- if (s->oformat->write_header && !s->oformat->check_bitstream) {
- ret = s->oformat->write_header(s);
- if (ret >= 0 && s->pb && s->pb->error < 0)
- ret = s->pb->error;
+ if (!s->oformat->check_bitstream) {
+ ret = write_header_internal(s);
if (ret < 0)
goto fail;
- if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS)
- avio_flush(s->pb);
- s->internal->header_written = 1;
}
if ((ret = init_pts(s)) < 0)
did_split = av_packet_split_side_data(pkt);
- if (!s->internal->header_written && s->oformat->write_header) {
- ret = s->oformat->write_header(s);
- if (ret >= 0 && s->pb && s->pb->error < 0)
- ret = s->pb->error;
+ if (!s->internal->header_written) {
+ ret = write_header_internal(s);
if (ret < 0)
goto fail;
- if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS)
- avio_flush(s->pb);
- s->internal->header_written = 1;
}
if ((pkt->flags & AV_PKT_FLAG_UNCODED_FRAME)) {
goto fail;
}
- if (!s->internal->header_written && s->oformat->write_header) {
- ret = s->oformat->write_header(s);
- if (ret >= 0 && s->pb && s->pb->error < 0)
- ret = s->pb->error;
+ if (!s->internal->header_written) {
+ ret = write_header_internal(s);
if (ret < 0)
goto fail;
- if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS)
- avio_flush(s->pb);
- s->internal->header_written = 1;
}
fail:
- if ((s->internal->header_written || !s->oformat->write_header) && s->oformat->write_trailer)
+ if (s->internal->header_written && s->oformat->write_trailer)
if (ret >= 0) {
ret = s->oformat->write_trailer(s);
} else {