Mercurial > libavcodec.hg
comparison ps.c @ 11890:747ea58d1ac6 libavcodec
Remove iid_mode from the PS context.
| author | alexc |
|---|---|
| date | Sun, 20 Jun 2010 17:15:28 +0000 |
| parents | c432b63b345e |
| children | 72441b6700d4 |
comparison
equal
deleted
inserted
replaced
| 11889:b9f69606a094 | 11890:747ea58d1ac6 |
|---|---|
| 154 | 154 |
| 155 header = get_bits1(gb); | 155 header = get_bits1(gb); |
| 156 if (header) { //enable_ps_header | 156 if (header) { //enable_ps_header |
| 157 ps->enable_iid = get_bits1(gb); | 157 ps->enable_iid = get_bits1(gb); |
| 158 if (ps->enable_iid) { | 158 if (ps->enable_iid) { |
| 159 ps->iid_mode = get_bits(gb, 3); | 159 int iid_mode = get_bits(gb, 3); |
| 160 if (ps->iid_mode > 5) { | 160 if (iid_mode > 5) { |
| 161 av_log(avctx, AV_LOG_ERROR, "iid_mode %d is reserved.\n", | 161 av_log(avctx, AV_LOG_ERROR, "iid_mode %d is reserved.\n", |
| 162 ps->iid_mode); | 162 iid_mode); |
| 163 goto err; | 163 goto err; |
| 164 } | 164 } |
| 165 ps->nr_iid_par = nr_iidicc_par_tab[ps->iid_mode]; | 165 ps->nr_iid_par = nr_iidicc_par_tab[iid_mode]; |
| 166 ps->iid_quant = ps->iid_mode > 2; | 166 ps->iid_quant = iid_mode > 2; |
| 167 ps->nr_ipdopd_par = nr_iidopd_par_tab[ps->iid_mode]; | 167 ps->nr_ipdopd_par = nr_iidopd_par_tab[iid_mode]; |
| 168 } | 168 } |
| 169 ps->enable_icc = get_bits1(gb); | 169 ps->enable_icc = get_bits1(gb); |
| 170 if (ps->enable_icc) { | 170 if (ps->enable_icc) { |
| 171 ps->icc_mode = get_bits(gb, 3); | 171 ps->icc_mode = get_bits(gb, 3); |
| 172 if (ps->icc_mode > 5) { | 172 if (ps->icc_mode > 5) { |