X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fg729dec.c;h=eca69026c03bb7a769844b7094ef4143ad6559a6;hb=1c7f252783aec37e4ff8049476386f63afe91756;hp=70cf3391bd836b055f232cf19a7e7eea421649fc;hpb=576746b4e30069a922564e0019ef0758811e771d;p=ffmpeg

diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 70cf3391bd8..eca69026c03 100644
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -457,11 +457,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
             buf++;
         }
 
-        for (i = 0; i < buf_size; i++)
+        for (i = 0; i < format->block_size; i++)
             frame_erasure |= buf[i];
         frame_erasure = !frame_erasure;
 
-        init_get_bits(&gb, buf, 8*buf_size);
+        init_get_bits8(&gb, buf, format->block_size);
 
         ma_predictor     = get_bits(&gb, 1);
         quantizer_1st    = get_bits(&gb, VQ_1ST_BITS);
@@ -750,7 +750,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec ff_g729_decoder = {
+const AVCodec ff_g729_decoder = {
     .name           = "g729",
     .long_name      = NULL_IF_CONFIG_SMALL("G.729"),
     .type           = AVMEDIA_TYPE_AUDIO,
@@ -762,7 +762,7 @@ AVCodec ff_g729_decoder = {
     .capabilities   = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1,
 };
 
-AVCodec ff_acelp_kelvin_decoder = {
+const AVCodec ff_acelp_kelvin_decoder = {
     .name           = "acelp.kelvin",
     .long_name      = NULL_IF_CONFIG_SMALL("Sipro ACELP.KELVIN"),
     .type           = AVMEDIA_TYPE_AUDIO,