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

[Monty]

xiphmont    03/12/30 07:23:30

  Modified:    lib      vorbisenc.c
  Log:
  Correct nominal setting flaw in managed setup when mina nd max are
  both specified.

Revision  Changes    Path
1.49      +4 -1      vorbis/lib/vorbisenc.c

Index: vorbisenc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/vorbisenc.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- vorbisenc.c	30 Dec 2003 11:02:22 -0000	1.48
+++ vorbisenc.c	30 Dec 2003 12:23:29 -0000	1.49
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.48 2003/12/30 11:02:22 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.49 2003/12/30 12:23:29 xiphmont Exp $
 
  ********************************************************************/
 
@@ -947,7 +947,10 @@
 
   if(nominal_bitrate<=0.){
     if(max_bitrate>0.){
-      nominal_bitrate=max_bitrate*.875;
+      if(min_bitrate>0.)
+	nominal_bitrate=(max_bitrate+min_bitrate)*.5;
+      else
+	nominal_bitrate=max_bitrate*.875;
     }else{
       if(min_bitrate>0.){
         nominal_bitrate=min_bitrate;

<p><p>--- >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.