Revert the revert to 1.0.0 vorbis.m4 code.

Original commit message from CVS:
Revert the revert to 1.0.0 vorbis.m4 code.

This bugfix has been accepted upstream to fix a segfault due to a bogus
function parameter.  (the cause of the segfault should probably be fixed but
until then...)

diff --git a/m4/vorbis.m4 b/m4/vorbis.m4
index 98fa5d9d244f4f7a48d24588fcc45518589195e8..d311a410aa2a64d980774249b287b1eb8007fa10 100644 (file)
--- a/m4/vorbis.m4
+++ b/m4/vorbis.m4
@@ -54,6 +54,7 @@ dnl
 #include <stdlib.h>
 #include <string.h>
 #include <vorbis/codec.h>
+#include <vorbis/vorbisenc.h>
 
 int main ()
 {
@@ -62,7 +63,7 @@ int main ()
     vorbis_info                vi;
 
     vorbis_info_init (&vi);
-    vorbis_encode_init (&vi, 2, 44100, -1, 128, -1);
+    vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1);
     vorbis_analysis_init (&vd, &vi);
     vorbis_block_init (&vd, &vb);
     /* this function was added in 1.0rc3, so this is what we're testing for */