# HG changeset patch
# User michaelni
# Date 1040486061 0
# Node ID 159333d9297ed991b251216498020098dd66b0d3
# Parent  8254eac2448831ad65dc45c97ff256e789a018b7
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)

diff -r 8254eac24488 -r 159333d9297e oggvorbis.c
--- a/oggvorbis.c	Thu Dec 19 18:59:45 2002 +0000
+++ b/oggvorbis.c	Sat Dec 21 15:54:21 2002 +0000
@@ -24,12 +24,20 @@
 
 
 int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) {
-    if(avccontext->coded_frame->quality) /* VBR requested */
-	return vorbis_encode_init_vbr(vi, avccontext->channels,
-		  avccontext->sample_rate, (float)avccontext->coded_frame->quality / 1000) ;
+
+#ifdef OGGVORBIS_VBR_BY_ESTIMATE
+    /* variable bitrate by estimate */
+
+    return (vorbis_encode_setup_managed(vi, avccontext->channels,
+              avccontext->sample_rate, -1, avccontext->bit_rate, -1) ||
+	    vorbis_encode_ctl(vi, OV_ECTL_RATEMANAGE_AVG, NULL) ||
+	    vorbis_encode_setup_init(vi)) ;
+#else
+    /* constant bitrate */
 
     return vorbis_encode_init(vi, avccontext->channels,
 	          avccontext->sample_rate, -1, avccontext->bit_rate, -1) ;
+#endif
 }