Commit 49f82571 authored by Paul B Mahol's avatar Paul B Mahol

avcodec/tak_parser: use init_get_bits8()

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent c93a7b26
...@@ -43,10 +43,12 @@ static int tak_parse(AVCodecParserContext *s, AVCodecContext *avctx, ...@@ -43,10 +43,12 @@ static int tak_parse(AVCodecParserContext *s, AVCodecContext *avctx,
GetBitContext gb; GetBitContext gb;
int consumed = 0; int consumed = 0;
int needed = buf_size ? TAK_MAX_FRAME_HEADER_BYTES : 8; int needed = buf_size ? TAK_MAX_FRAME_HEADER_BYTES : 8;
int ret;
if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
TAKStreamInfo ti; TAKStreamInfo ti;
init_get_bits(&gb, buf, buf_size); if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0)
return ret;
if (!ff_tak_decode_frame_header(avctx, &gb, &ti, 127)) if (!ff_tak_decode_frame_header(avctx, &gb, &ti, 127))
s->duration = t->ti.last_frame_samples ? t->ti.last_frame_samples s->duration = t->ti.last_frame_samples ? t->ti.last_frame_samples
: t->ti.frame_samples; : t->ti.frame_samples;
...@@ -73,8 +75,9 @@ static int tak_parse(AVCodecParserContext *s, AVCodecContext *avctx, ...@@ -73,8 +75,9 @@ static int tak_parse(AVCodecParserContext *s, AVCodecContext *avctx,
pc->buffer[ t->index + 1 ] == 0xA0) { pc->buffer[ t->index + 1 ] == 0xA0) {
TAKStreamInfo ti; TAKStreamInfo ti;
init_get_bits(&gb, pc->buffer + t->index, if ((ret = init_get_bits8(&gb, pc->buffer + t->index,
8 * (pc->index - t->index)); pc->index - t->index)) < 0)
return ret;
if (!ff_tak_decode_frame_header(avctx, &gb, if (!ff_tak_decode_frame_header(avctx, &gb,
pc->frame_start_found ? &ti : &t->ti, 127) && pc->frame_start_found ? &ti : &t->ti, 127) &&
!ff_tak_check_crc(pc->buffer + t->index, !ff_tak_check_crc(pc->buffer + t->index,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment