Mercurial > libavcodec.hg
comparison h264.c @ 8453:c78334e57b52 libavcodec
Indent
| author | michael |
|---|---|
| date | Tue, 23 Dec 2008 22:06:16 +0000 |
| parents | 06d4e91d7c24 |
| children | bc5f446ed4a8 |
comparison
equal
deleted
inserted
replaced
| 8452:06d4e91d7c24 | 8453:c78334e57b52 |
|---|---|
| 4505 tmp= 0; | 4505 tmp= 0; |
| 4506 }else if(ref_count == 2){ | 4506 }else if(ref_count == 2){ |
| 4507 tmp= get_bits1(&s->gb)^1; | 4507 tmp= get_bits1(&s->gb)^1; |
| 4508 }else{ | 4508 }else{ |
| 4509 tmp= get_ue_golomb_31(&s->gb); | 4509 tmp= get_ue_golomb_31(&s->gb); |
| 4510 if(tmp>=ref_count){ | 4510 if(tmp>=ref_count){ |
| 4511 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", tmp); | 4511 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", tmp); |
| 4512 return -1; | 4512 return -1; |
| 4513 } | 4513 } |
| 4514 } | 4514 } |
| 4515 ref[list][i]= tmp; | 4515 ref[list][i]= tmp; |
| 4516 }else{ | 4516 }else{ |
| 4517 //FIXME | 4517 //FIXME |
| 4518 ref[list][i] = -1; | 4518 ref[list][i] = -1; |
| 4579 if(h->ref_count[list]==1){ | 4579 if(h->ref_count[list]==1){ |
| 4580 val= 0; | 4580 val= 0; |
| 4581 }else if(h->ref_count[list]==2){ | 4581 }else if(h->ref_count[list]==2){ |
| 4582 val= get_bits1(&s->gb)^1; | 4582 val= get_bits1(&s->gb)^1; |
| 4583 }else{ | 4583 }else{ |
| 4584 val= get_ue_golomb_31(&s->gb); | 4584 val= get_ue_golomb_31(&s->gb); |
| 4585 if(val >= h->ref_count[list]){ | 4585 if(val >= h->ref_count[list]){ |
| 4586 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val); | 4586 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val); |
| 4587 return -1; | 4587 return -1; |
| 4588 } | 4588 } |
| 4589 } | 4589 } |
| 4590 }else | 4590 }else |
| 4591 val= LIST_NOT_USED&0xFF; | 4591 val= LIST_NOT_USED&0xFF; |
| 4592 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | 4592 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); |
| 4593 } | 4593 } |
| 4613 if(h->ref_count[list] == 1){ | 4613 if(h->ref_count[list] == 1){ |
| 4614 val= 0; | 4614 val= 0; |
| 4615 }else if(h->ref_count[list] == 2){ | 4615 }else if(h->ref_count[list] == 2){ |
| 4616 val= get_bits1(&s->gb)^1; | 4616 val= get_bits1(&s->gb)^1; |
| 4617 }else{ | 4617 }else{ |
| 4618 val= get_ue_golomb_31(&s->gb); | 4618 val= get_ue_golomb_31(&s->gb); |
| 4619 if(val >= h->ref_count[list]){ | 4619 if(val >= h->ref_count[list]){ |
| 4620 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val); | 4620 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val); |
| 4621 return -1; | 4621 return -1; |
| 4622 } | 4622 } |
| 4623 } | 4623 } |
| 4624 }else | 4624 }else |
| 4625 val= LIST_NOT_USED&0xFF; | 4625 val= LIST_NOT_USED&0xFF; |
| 4626 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); | 4626 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); |
| 4627 } | 4627 } |
| 4650 if(h->ref_count[list]==1){ | 4650 if(h->ref_count[list]==1){ |
| 4651 val= 0; | 4651 val= 0; |
| 4652 }else if(h->ref_count[list]==2){ | 4652 }else if(h->ref_count[list]==2){ |
| 4653 val= get_bits1(&s->gb)^1; | 4653 val= get_bits1(&s->gb)^1; |
| 4654 }else{ | 4654 }else{ |
| 4655 val= get_ue_golomb_31(&s->gb); | 4655 val= get_ue_golomb_31(&s->gb); |
| 4656 if(val >= h->ref_count[list]){ | 4656 if(val >= h->ref_count[list]){ |
| 4657 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val); | 4657 av_log(h->s.avctx, AV_LOG_ERROR, "ref %u overflow\n", val); |
| 4658 return -1; | 4658 return -1; |
| 4659 } | 4659 } |
| 4660 } | 4660 } |
| 4661 }else | 4661 }else |
| 4662 val= LIST_NOT_USED&0xFF; | 4662 val= LIST_NOT_USED&0xFF; |
| 4663 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); | 4663 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); |
| 4664 } | 4664 } |