Mercurial > libavcodec.hg
comparison h264_cavlc.c @ 10946:5a23fa01dec1 libavcodec
Merge multiple IS_* macro uses where possible.
| author | michael |
|---|---|
| date | Wed, 20 Jan 2010 01:15:30 +0000 |
| parents | b847f02d5b03 |
| children | d5320d1acaee |
comparison
equal
deleted
inserted
replaced
| 10945:0d93bbc17950 | 10946:5a23fa01dec1 |
|---|---|
| 680 return -1; | 680 return -1; |
| 681 } | 681 } |
| 682 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | 682 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; |
| 683 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; | 683 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; |
| 684 } | 684 } |
| 685 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) | 685 if( IS_DIRECT(h->sub_mb_type[0]|h->sub_mb_type[1]|h->sub_mb_type[2]|h->sub_mb_type[3])) { |
| 686 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) { | |
| 687 ff_h264_pred_direct_motion(h, &mb_type); | 686 ff_h264_pred_direct_motion(h, &mb_type); |
| 688 h->ref_cache[0][scan8[4]] = | 687 h->ref_cache[0][scan8[4]] = |
| 689 h->ref_cache[1][scan8[4]] = | 688 h->ref_cache[1][scan8[4]] = |
| 690 h->ref_cache[0][scan8[12]] = | 689 h->ref_cache[0][scan8[12]] = |
| 691 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE; | 690 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE; |