# HG changeset patch # User bcoudurier # Date 1233398966 0 # Node ID 60bad0ded22a1cfb1b7717ce3cf6005ef9d247a8 # Parent 1057791944e4068c1812e37cb372f9e06c5fe054 do not use PAL_samples_per_frame in init, to make init independant diff -r 1057791944e4 -r 60bad0ded22a mxfenc.c --- a/mxfenc.c Sat Jan 31 10:47:55 2009 +0000 +++ b/mxfenc.c Sat Jan 31 10:49:26 2009 +0000 @@ -878,7 +878,7 @@ 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 @@ 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;