Mercurial > libavcodec.hg
comparison wmv2enc.c @ 6481:493dc59d469a libavcodec
add FF_ prefix to all (frame)_TYPE usage
| author | aurel |
|---|---|
| date | Sun, 09 Mar 2008 23:31:02 +0000 |
| parents | b47573cb7401 |
| children | 48759bfbd073 |
comparison
equal
deleted
inserted
replaced
| 6480:6f01a499e785 | 6481:493dc59d469a |
|---|---|
| 82 int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number) | 82 int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number) |
| 83 { | 83 { |
| 84 Wmv2Context * const w= (Wmv2Context*)s; | 84 Wmv2Context * const w= (Wmv2Context*)s; |
| 85 | 85 |
| 86 put_bits(&s->pb, 1, s->pict_type - 1); | 86 put_bits(&s->pb, 1, s->pict_type - 1); |
| 87 if(s->pict_type == I_TYPE){ | 87 if(s->pict_type == FF_I_TYPE){ |
| 88 put_bits(&s->pb, 7, 0); | 88 put_bits(&s->pb, 7, 0); |
| 89 } | 89 } |
| 90 put_bits(&s->pb, 5, s->qscale); | 90 put_bits(&s->pb, 5, s->qscale); |
| 91 | 91 |
| 92 s->dc_table_index = 1; | 92 s->dc_table_index = 1; |
| 98 w->abt_type=0; | 98 w->abt_type=0; |
| 99 w->j_type=0; | 99 w->j_type=0; |
| 100 | 100 |
| 101 assert(s->flipflop_rounding); | 101 assert(s->flipflop_rounding); |
| 102 | 102 |
| 103 if (s->pict_type == I_TYPE) { | 103 if (s->pict_type == FF_I_TYPE) { |
| 104 assert(s->no_rounding==1); | 104 assert(s->no_rounding==1); |
| 105 if(w->j_type_bit) put_bits(&s->pb, 1, w->j_type); | 105 if(w->j_type_bit) put_bits(&s->pb, 1, w->j_type); |
| 106 | 106 |
| 107 if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table); | 107 if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table); |
| 108 | 108 |
| 206 #if 0 | 206 #if 0 |
| 207 if (coded_cbp) | 207 if (coded_cbp) |
| 208 printf("cbp=%x %x\n", cbp, coded_cbp); | 208 printf("cbp=%x %x\n", cbp, coded_cbp); |
| 209 #endif | 209 #endif |
| 210 | 210 |
| 211 if (s->pict_type == I_TYPE) { | 211 if (s->pict_type == FF_I_TYPE) { |
| 212 put_bits(&s->pb, | 212 put_bits(&s->pb, |
| 213 ff_msmp4_mb_i_table[coded_cbp][1], ff_msmp4_mb_i_table[coded_cbp][0]); | 213 ff_msmp4_mb_i_table[coded_cbp][1], ff_msmp4_mb_i_table[coded_cbp][0]); |
| 214 } else { | 214 } else { |
| 215 put_bits(&s->pb, | 215 put_bits(&s->pb, |
| 216 wmv2_inter_table[w->cbp_table_index][cbp][1], | 216 wmv2_inter_table[w->cbp_table_index][cbp][1], |