virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/tak_parser: use init_get_bits8()

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-02-03 15:27:28 +00:00
parent c93a7b264f
commit 49f8257135
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/tak_parser.c
View File

@ -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,
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,