Mercurial > libavformat.hg

changeset 4327:60bad0ded22a libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not use PAL_samples_per_frame in init, to make init independant
author bcoudurier
date Sat, 31 Jan 2009 10:49:26 +0000
parents 1057791944e4
children fb0fde31327a
files mxfenc.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;