ffmpeg | branch: master | Alexandra Hájková <alexan...@khirnov.net> | Fri Apr 15 10:57:22 2016 +0200| [be35ef92a418916f0fceaf18af5f5b768c44117f] | committer: Diego Biurrun
xan: Convert to the new bitstream reader > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be35ef92a418916f0fceaf18af5f5b768c44117f --- libavcodec/xan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/xan.c b/libavcodec/xan.c index c16c651..33149e5 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -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]; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog