[xiph-commits] r9568 - trunk/vorbis-tools/oggenc

[giles at svn.xiph.org]

Author: giles
Date: 2005-07-15 10:03:52 -0700 (Fri, 15 Jul 2005)
New Revision: 9568

Modified:
   trunk/vorbis-tools/oggenc/encode.c
Log:
Relocate a no-block-head local variable declaration that was
causing problems on some older compilers. This was C99 anyway.
Also, update a comment now that libvorbis 1.1.1 is out.


Modified: trunk/vorbis-tools/oggenc/encode.c
===================================================================
--- trunk/vorbis-tools/oggenc/encode.c	2005-07-15 15:52:57 UTC (rev 9567)
+++ trunk/vorbis-tools/oggenc/encode.c	2005-07-15 17:03:52 UTC (rev 9568)
@@ -159,9 +159,11 @@
 
         /* do we have optional hard bitrate restrictions? */
         if(opt->max_bitrate > 0 || opt->min_bitrate > 0){
+            long bitrate;
             struct ovectl_ratemanage2_arg ai;
-	        vorbis_encode_ctl(&vi, OV_ECTL_RATEMANAGE2_GET, &ai);
 
+	    vorbis_encode_ctl(&vi, OV_ECTL_RATEMANAGE2_GET, &ai);
+
             /* libvorbis 1.1 (and current svn) doesn't actually fill this in,
                which looks like a bug. It'll then reject it when we call the
                SET version below. So, fill it in with the values that libvorbis
@@ -170,10 +172,9 @@
                values are dependent on the bitrate, and libvorbis has no way to
                get a nominal bitrate from a quality value. Well, except by doing
                a full setup... So, we do that. 
-               Also, note that this won't work correctly unless you have a very
-               recent (2005/03/04 or later) version of libvorbis from svn).
+               Also, note that this won't work correctly unless you have 
+	       version 1.1.1 or later of libvorbis.
              */
-            long bitrate;
 
             {
                 vorbis_info vi2;