diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 9872ebdd18..02a0e54f9e 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -878,7 +878,7 @@ static int ff_audio_interleave_init(AVFormatContext *s, const int *samples_per_f int i; if (!samples_per_frame) - samples_per_frame = PAL_samples_per_frame; + return -1; for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; @@ -961,6 +961,9 @@ static int mxf_write_header(AVFormatContext *s) sc->order = AV_RB32(sc->track_essence_element_key+12); } + if (!samples_per_frame) + samples_per_frame = PAL_samples_per_frame; + if (ff_audio_interleave_init(s, samples_per_frame) < 0) return -1;