[FFmpeg-cvslog] avcodec/smacker: use init_get_bits8()

[Clément Bœsch]

On Thu, Sep 12, 2013 at 06:37:38PM +0200, Paul B Mahol wrote:
> ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Sep 12 16:34:54 2013 +0000| [1b99514dfdc1d3fa60595b16d0e09c2b0b340ccb] | committer: Paul B Mahol
> 
> avcodec/smacker: use init_get_bits8()
> 
> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> 
> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b99514dfdc1d3fa60595b16d0e09c2b0b340ccb
> ---
> 
>  libavcodec/smacker.c |    8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
> index ed78fda..6b80826 100644
> --- a/libavcodec/smacker.c
> +++ b/libavcodec/smacker.c
> @@ -316,7 +316,7 @@ static int decode_header_trees(SmackVContext *smk) {
>      full_size = AV_RL32(smk->avctx->extradata + 8);
>      type_size = AV_RL32(smk->avctx->extradata + 12);
>  
> -    init_get_bits(&gb, smk->avctx->extradata + 16, (smk->avctx->extradata_size - 16) * 8);
> +    init_get_bits8(&gb, smk->avctx->extradata + 16, smk->avctx->extradata_size - 16);
>  

Why not check return code here...

>      if(!get_bits1(&gb)) {
>          av_log(smk->avctx, AV_LOG_INFO, "Skipping MMAP tree\n");
> @@ -431,7 +431,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
>      last_reset(smk->mclr_tbl, smk->mclr_last);
>      last_reset(smk->full_tbl, smk->full_last);
>      last_reset(smk->type_tbl, smk->type_last);
> -    init_get_bits(&gb, avpkt->data + 769, (avpkt->size - 769) * 8);
> +    if ((ret = init_get_bits8(&gb, avpkt->data + 769, avpkt->size - 769)) < 0)
> +        return ret;
>  

...while you check here and below?

>      blk = 0;
>      bw = avctx->width >> 2;
> @@ -647,7 +648,8 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data,
>          return AVERROR_INVALIDDATA;
>      }
>  
> -    init_get_bits(&gb, buf + 4, (buf_size - 4) * 8);
> +    if ((ret = init_get_bits8(&gb, buf + 4, buf_size - 4)) < 0)
> +        return ret;
>  
>      if(!get_bits1(&gb)){
>          av_log(avctx, AV_LOG_INFO, "Sound: no data\n");
> 

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20130913/96268b78/attachment.asc>