Mercurial > libavcodec.hg
comparison smacker.c @ 5513:9f8219a3b86f libavcodec
use get_bits1(..) instead get_bits(.., 1)
author | alex |
---|---|
date | Thu, 09 Aug 2007 00:13:31 +0000 |
parents | 2b72f9bc4f06 |
children | d2ef80f5fd7e |
comparison
equal
deleted
inserted
replaced
5512:28dcc5cd79d2 | 5513:9f8219a3b86f |
---|---|
288 smk->mmap_tbl[0] = 0; | 288 smk->mmap_tbl[0] = 0; |
289 smk->mmap_last[0] = smk->mmap_last[1] = smk->mmap_last[2] = 1; | 289 smk->mmap_last[0] = smk->mmap_last[1] = smk->mmap_last[2] = 1; |
290 } else { | 290 } else { |
291 smacker_decode_header_tree(smk, &gb, &smk->mmap_tbl, smk->mmap_last, mmap_size); | 291 smacker_decode_header_tree(smk, &gb, &smk->mmap_tbl, smk->mmap_last, mmap_size); |
292 } | 292 } |
293 if(!get_bits(&gb, 1)) { | 293 if(!get_bits1(&gb)) { |
294 av_log(smk->avctx, AV_LOG_INFO, "Skipping MCLR tree\n"); | 294 av_log(smk->avctx, AV_LOG_INFO, "Skipping MCLR tree\n"); |
295 smk->mclr_tbl = av_malloc(sizeof(int) * 2); | 295 smk->mclr_tbl = av_malloc(sizeof(int) * 2); |
296 smk->mclr_tbl[0] = 0; | 296 smk->mclr_tbl[0] = 0; |
297 smk->mclr_last[0] = smk->mclr_last[1] = smk->mclr_last[2] = 1; | 297 smk->mclr_last[0] = smk->mclr_last[1] = smk->mclr_last[2] = 1; |
298 } else { | 298 } else { |
299 smacker_decode_header_tree(smk, &gb, &smk->mclr_tbl, smk->mclr_last, mclr_size); | 299 smacker_decode_header_tree(smk, &gb, &smk->mclr_tbl, smk->mclr_last, mclr_size); |
300 } | 300 } |
301 if(!get_bits(&gb, 1)) { | 301 if(!get_bits1(&gb)) { |
302 av_log(smk->avctx, AV_LOG_INFO, "Skipping FULL tree\n"); | 302 av_log(smk->avctx, AV_LOG_INFO, "Skipping FULL tree\n"); |
303 smk->full_tbl = av_malloc(sizeof(int) * 2); | 303 smk->full_tbl = av_malloc(sizeof(int) * 2); |
304 smk->full_tbl[0] = 0; | 304 smk->full_tbl[0] = 0; |
305 smk->full_last[0] = smk->full_last[1] = smk->full_last[2] = 1; | 305 smk->full_last[0] = smk->full_last[1] = smk->full_last[2] = 1; |
306 } else { | 306 } else { |
307 smacker_decode_header_tree(smk, &gb, &smk->full_tbl, smk->full_last, full_size); | 307 smacker_decode_header_tree(smk, &gb, &smk->full_tbl, smk->full_last, full_size); |
308 } | 308 } |
309 if(!get_bits(&gb, 1)) { | 309 if(!get_bits1(&gb)) { |
310 av_log(smk->avctx, AV_LOG_INFO, "Skipping TYPE tree\n"); | 310 av_log(smk->avctx, AV_LOG_INFO, "Skipping TYPE tree\n"); |
311 smk->type_tbl = av_malloc(sizeof(int) * 2); | 311 smk->type_tbl = av_malloc(sizeof(int) * 2); |
312 smk->type_tbl[0] = 0; | 312 smk->type_tbl[0] = 0; |
313 smk->type_last[0] = smk->type_last[1] = smk->type_last[2] = 1; | 313 smk->type_last[0] = smk->type_last[1] = smk->type_last[2] = 1; |
314 } else { | 314 } else { |