Put AoTuV tunings merge (along with bugfixes) on the mainline. This

is ready for wider correctness testing; no substantial issues
expected.


svn path=/trunk/vorbis/; revision=7037

Author: Monty

examples/Makefile.am

@@ -7,8 +7,8 @@ INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
 noinst_PROGRAMS = decoder_example encoder_example chaining_example\
 		vorbisfile_example seeking_example
 
-LDFLAGS = -all-static
-LDADD = ../lib/libvorbis.la
+LDFLAGS = -all-static 
+LDADD = ../lib/libvorbis.la 
 
 decoder_example_SOURCES = decoder_example.c
 encoder_example_SOURCES = encoder_example.c

examples/encoder_example.c

@@ -121,12 +121,12 @@ int main(){
    using the bitrate interface, and then turning bitrate management off:
 
    ret = ( vorbis_encode_setup_managed(&vi,2,44100,-1,128000,-1) ||
-           vorbis_encode_ctl(&vi,OV_ECTL_RATEMANAGE_AVG,NULL) ||
+           vorbis_encode_ctl(&vi,OV_ECTL_RATEMANAGE2_SET,NULL) ||
            vorbis_encode_setup_init(&vi));
 
    *********************************************************************/
 
-  ret=vorbis_encode_init_vbr(&vi,2,44100,.5);
+  ret=vorbis_encode_init_vbr(&vi,2,44100,0.1);
 
   /* do not continue if setup failed; this can happen if we ask for a
      mode that libVorbis does not support (eg, too low a bitrate, etc,

lib/bitrate.c

@@ -223,7 +223,7 @@ int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd,ogg_packet *op){
 
     if(vorbis_bitrate_managed(vb))
       choice=bm->choice;
-    
+
     op->packet=oggpack_get_buffer(vbi->packetblob[choice]);
     op->bytes=oggpack_bytes(vbi->packetblob[choice]);
     op->b_o_s=0;