]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/wavpack: use init_get_bits8()
authorPaul B Mahol <onemda@gmail.com>
Tue, 29 Oct 2013 09:46:32 +0000 (09:46 +0000)
committerPaul B Mahol <onemda@gmail.com>
Wed, 30 Oct 2013 11:04:07 +0000 (11:04 +0000)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavcodec/wavpack.c

index 94a4cb4d6aef20f8d838f1ae3a10b07689d063c3..6036a5c7ddf9046fd0e51706b027448b09c95e39 100644 (file)
@@ -847,7 +847,8 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
         case WP_ID_DATA:
             s->sc.offset = bytestream2_tell(&gb);
             s->sc.size   = size * 8;
-            init_get_bits(&s->gb, gb.buffer, size * 8);
+            if ((ret = init_get_bits8(&s->gb, gb.buffer, size)) < 0)
+                return ret;
             s->data_size = size * 8;
             bytestream2_skip(&gb, size);
             got_bs       = 1;
@@ -861,7 +862,8 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
             }
             s->extra_sc.offset = bytestream2_tell(&gb);
             s->extra_sc.size   = size * 8;
-            init_get_bits(&s->gb_extra_bits, gb.buffer, size * 8);
+            if ((ret = init_get_bits8(&s->gb_extra_bits, gb.buffer, size)) < 0)
+                return ret;
             s->crc_extra_bits  = get_bits_long(&s->gb_extra_bits, 32);
             bytestream2_skip(&gb, size);
             s->got_extra_bits  = 1;