cavsdec: Fix assertion failure.

[ffmpeg] / libavcodec / vorbisenc.c

diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index 7a053c2acce8198d19453dd445280a13c8bd1e30..b88791f274e358813de8d746b8568bc55b73b636 100644 (file)
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -1177,8 +1177,9 @@ static av_cold int vorbis_encode_init(AVCodecContext *avccontext)
     if ((ret = create_vorbis_context(venc, avccontext)) < 0)
         goto error;
 
+    avccontext->bit_rate = 0;
     if (avccontext->flags & CODEC_FLAG_QSCALE)
-        venc->quality = avccontext->global_quality / (float)FF_QP2LAMBDA / 10.;
+        venc->quality = avccontext->global_quality / (float)FF_QP2LAMBDA;
     else
         venc->quality = 8;
     venc->quality *= venc->quality;
@@ -1206,7 +1207,7 @@ error:
 AVCodec ff_vorbis_encoder = {
     .name           = "vorbis",
     .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = CODEC_ID_VORBIS,
+    .id             = AV_CODEC_ID_VORBIS,
     .priv_data_size = sizeof(vorbis_enc_context),
     .init           = vorbis_encode_init,
     .encode2        = vorbis_encode_frame,