From f9c59f26c852cec4dd7e5c04d26ec284a796a919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= <alexandra@khirnov.net>
Date: Fri, 15 Apr 2016 10:50:38 +0200
Subject: [PATCH] wnv1: Convert to the new bitstream reader
---
libavcodec/wnv1.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c
index d0304c97ad6..80d66ae96cb 100644
--- a/libavcodec/wnv1.c
+++ b/libavcodec/wnv1.c
@@ -25,7 +25,7 @@
*/
#include "avcodec.h"
-#include "get_bits.h"
+#include "bitstream.h"
#include "internal.h"
#include "mathops.h"
@@ -34,7 +34,7 @@ typedef struct WNV1Context {
AVCodecContext *avctx;
int shift;
- GetBitContext gb;
+ BitstreamContext bc;
} WNV1Context;
static const uint16_t code_tab[16][2] = {
@@ -49,10 +49,10 @@ static VLC code_vlc;
/* returns modified base_value */
static inline int wnv1_get_code(WNV1Context *w, int base_value)
{
- int v = get_vlc2(&w->gb, code_vlc.table, CODE_VLC_BITS, 1);
+ int v = bitstream_read_vlc(&w->bc, code_vlc.table, CODE_VLC_BITS, 1);
if (v == 15)
- return ff_reverse[get_bits(&w->gb, 8 - w->shift)];
+ return ff_reverse[bitstream_read(&w->bc, 8 - w->shift)];
else
return base_value + ((v - 7) << w->shift);
}
@@ -90,7 +90,7 @@ static int decode_frame(AVCodecContext *avctx,
for (i = 8; i < buf_size; i++)
rbuf[i] = ff_reverse[buf[i]];
- init_get_bits(&l->gb, rbuf + 8, (buf_size - 8) * 8);
+ bitstream_init(&l->bc, rbuf + 8, (buf_size - 8) * 8);
if (buf[2] >> 4 == 6)
l->shift = 2;
--
GitLab