[FFmpeg-cvslog] r16902 - trunk/libavformat/mxfenc.c

[bcoudurier]

Author: bcoudurier
Date: Sat Jan 31 11:49:26 2009
New Revision: 16902

Log:
do not use PAL_samples_per_frame in init, to make init independant

Modified:
   trunk/libavformat/mxfenc.c

Modified: trunk/libavformat/mxfenc.c
==============================================================================
--- trunk/libavformat/mxfenc.c	Sat Jan 31 11:47:55 2009	(r16901)
+++ trunk/libavformat/mxfenc.c	Sat Jan 31 11:49:26 2009	(r16902)
@@ -878,7 +878,7 @@ static int ff_audio_interleave_init(AVFo
     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(AVFormatCont
         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;