From 0ec63f40e139805832fc3cc64c8cf5fac56ddfe8 Mon Sep 17 00:00:00 2001
From: darkeye <darkeye@caa462fc-51d2-11de-8b28-e1b452efc53a>
Date: Thu, 22 Aug 2002 21:52:08 +0000
Subject: [PATCH] bug fix: maximum bitrate setting fixed for Ogg Vorbis streams

---
 darkice/trunk/ChangeLog                | 4 ++++
 darkice/trunk/configure.in             | 2 +-
 darkice/trunk/src/VorbisLibEncoder.cpp | 7 +++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/darkice/trunk/ChangeLog b/darkice/trunk/ChangeLog
index e64f15a..491740f 100644
--- a/darkice/trunk/ChangeLog
+++ b/darkice/trunk/ChangeLog
@@ -1,3 +1,7 @@
+DarkIce next release
+
+    o bug fix: maximum bitrate setting fixed for Ogg Vorbis streams
+
 20-08-2002: DarkIce 0.11 released
 
     o added possibility to specify maximum bitrate for Ogg Vorbis streams
diff --git a/darkice/trunk/configure.in b/darkice/trunk/configure.in
index c6289e0..c2abdec 100644
--- a/darkice/trunk/configure.in
+++ b/darkice/trunk/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/DarkIce.cpp)
-AM_INIT_AUTOMAKE(darkice, 0.11)
+AM_INIT_AUTOMAKE(darkice, 0.11.1beta)
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/darkice/trunk/src/VorbisLibEncoder.cpp b/darkice/trunk/src/VorbisLibEncoder.cpp
index 8dc5b18..72ffd68 100644
--- a/darkice/trunk/src/VorbisLibEncoder.cpp
+++ b/darkice/trunk/src/VorbisLibEncoder.cpp
@@ -133,9 +133,9 @@ VorbisLibEncoder :: open ( void )
                 if ( (ret = vorbis_encode_init( &vorbisInfo,
                                                 getInChannel(),
                                                 getOutSampleRate(),
-                                                -1,
+                                                maxBitrate,
                                                 getOutBitrate() * 1000,
-                                                maxBitrate)) ) {
+                                                -1)) ) {
                     throw Exception( __FILE__, __LINE__,
                                      "vorbis encode init error", ret);
                 }
@@ -368,6 +368,9 @@ VorbisLibEncoder :: close ( void )                    throw ( Exception )
   $Source$
 
   $Log$
+  Revision 1.14  2002/08/22 21:52:08  darkeye
+  bug fix: maximum bitrate setting fixed for Ogg Vorbis streams
+
   Revision 1.13  2002/08/20 19:35:37  darkeye
   added possibility to specify maximum bitrate for Ogg Vorbis streams