[xiph-cvs] cvs commit: vorbis/lib vorbisenc.c

[Monty]

xiphmont    01/12/21 00:44:08

  Modified:    lib      vorbisenc.c
  Log:
  Config samplerate error not being propogated up by vorbis_encode_init fixed

Revision  Changes    Path
1.29      +9 -3      vorbis/lib/vorbisenc.c

Index: vorbisenc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/vorbisenc.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- vorbisenc.c	2001/12/19 23:13:33	1.28
+++ vorbisenc.c	2001/12/21 08:44:07	1.29
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.28 2001/12/19 23:13:33 segher Exp $
+ last mod: $Id: vorbisenc.c,v 1.29 2001/12/21 08:44:07 xiphmont Exp $
 
  ********************************************************************/
 
@@ -982,8 +982,10 @@
       ci->bi.queue_avg_time=4.;
     }
     ci->bi.avgfloat_noise_maxval=_bm_max_noise_offset[(int)approx_vbr];
+    /*if(max_bitrate>0.){
+      ci->bi.avgfloat_minimum=0.;
+      }*/
 
-
   }
   return(ret);
 }
@@ -1000,7 +1002,11 @@
                                       max_bitrate,
                                       nominal_bitrate,
                                       min_bitrate);
-  
+  if(ret){
+    vorbis_info_clear(vi);
+    return(ret);
+  }
+
   ret=vorbis_encode_setup_init(vi);
   if(ret)
     vorbis_info_clear(vi);

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.