From b61cb61ab8f9abca98cc8c4d67cbefdb30f1e82a Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Wed, 18 Mar 2015 21:57:58 +0100 Subject: mxfenc: don't try to write footer without header This fixes a crash, when trying to mux h264 into mxf_opatom. Signed-off-by: Andreas Cadhalpun Previous version reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer --- libavformat/mxfenc.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libavformat') diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index e9c4a9dc84..0349e5d34d 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2402,6 +2402,13 @@ static int mxf_write_footer(AVFormatContext *s) AVIOContext *pb = s->pb; int err = 0; + if (!mxf->header_written || + (s->oformat == &ff_mxf_opatom_muxer && !mxf->body_partition_offset)) { + /* reason could be invalid options/not supported codec/out of memory */ + err = AVERROR_UNKNOWN; + goto end; + } + mxf->duration = mxf->last_indexed_edit_unit + mxf->edit_units_count; mxf_write_klv_fill(s); -- cgit v1.2.3