diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 7d821784c8..54e327d6be 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -702,27 +702,9 @@ static void mxf_build_structural_metadata(AVFormatContext *s, enum MXFMetadataSe static int mxf_write_header_metadata_sets(AVFormatContext *s) { - AVStream *st; - MXFStreamContext *sc = NULL; - int i; - mxf_write_preface(s); mxf_write_identification(s); mxf_write_content_storage(s); - - for (i = 0; i < s->nb_streams; i++) { - st = s->streams[i]; - sc = av_mallocz(sizeof(MXFStreamContext)); - if (!sc) - return AVERROR(ENOMEM); - st->priv_data = sc; - // set pts information - if (st->codec->codec_type == CODEC_TYPE_VIDEO) - av_set_pts_info(st, 64, 1, st->codec->time_base.den); - else if (st->codec->codec_type == CODEC_TYPE_AUDIO) - av_set_pts_info(st, 64, 1, st->codec->sample_rate); - } - mxf_build_structural_metadata(s, MaterialPackage); mxf_build_structural_metadata(s, SourcePackage); return 0; @@ -774,6 +756,20 @@ static int mux_write_header(AVFormatContext *s) MXFContext *mxf = s->priv_data; ByteIOContext *pb = s->pb; int64_t header_metadata_start, offset_now; + int i; + + for (i = 0; i < s->nb_streams; i++) { + AVStream *st = s->streams[i]; + MXFStreamContext *sc = av_mallocz(sizeof(MXFStreamContext)); + if (!sc) + return AVERROR(ENOMEM); + st->priv_data = sc; + // set pts information + if (st->codec->codec_type == CODEC_TYPE_VIDEO) + av_set_pts_info(st, 64, 1, st->codec->time_base.den); + else if (st->codec->codec_type == CODEC_TYPE_AUDIO) + av_set_pts_info(st, 64, 1, st->codec->sample_rate); + } mxf_write_partition(s, 0, 1, header_partition_key);