RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xan: Convert to the new bitstream reader

This commit is contained in:
Alexandra Hájková 2016-04-15 10:57:22 +02:00 committed by Diego Biurrun
parent f9c59f26c8
commit be35ef92a4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/xan.c
View File

@ -37,8 +37,8 @@
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "bitstream.h"
#include "bytestream.h"
#include "get_bits.h"
#include "internal.h"
#define RUNTIME_GAMMA 0
@ -124,15 +124,15 @@ static int xan_huffman_decode(unsigned char *dest, int dest_len,
unsigned char val = ival;
unsigned char *dest_end = dest + dest_len;
unsigned char *dest_start = dest;
GetBitContext gb;
BitstreamContext bc;
if (ptr_len < 0)
return AVERROR_INVALIDDATA;
init_get_bits(&gb, ptr, ptr_len * 8);
bitstream_init(&bc, ptr, ptr_len * 8);
while (val != 0x16) {
unsigned idx = val - 0x17 + get_bits1(&gb) * byte;
unsigned idx = val - 0x17 + bitstream_read_bit(&bc) * byte;
if (idx >= 2 * byte)
return AVERROR_INVALIDDATA;
val = src[idx];