# HG changeset patch # User alexc # Date 1277054128 0 # Node ID 747ea58d1ac62d7570423353754ab34f496120f8 # Parent b9f69606a094af2805cc246023f61807f6ae7d98 Remove iid_mode from the PS context. diff -r b9f69606a094 -r 747ea58d1ac6 ps.c --- a/ps.c Sun Jun 20 13:00:24 2010 +0000 +++ b/ps.c Sun Jun 20 17:15:28 2010 +0000 @@ -156,15 +156,15 @@ if (header) { //enable_ps_header ps->enable_iid = get_bits1(gb); if (ps->enable_iid) { - ps->iid_mode = get_bits(gb, 3); - if (ps->iid_mode > 5) { + int iid_mode = get_bits(gb, 3); + if (iid_mode > 5) { av_log(avctx, AV_LOG_ERROR, "iid_mode %d is reserved.\n", - ps->iid_mode); + iid_mode); goto err; } - ps->nr_iid_par = nr_iidicc_par_tab[ps->iid_mode]; - ps->iid_quant = ps->iid_mode > 2; - ps->nr_ipdopd_par = nr_iidopd_par_tab[ps->iid_mode]; + ps->nr_iid_par = nr_iidicc_par_tab[iid_mode]; + ps->iid_quant = iid_mode > 2; + ps->nr_ipdopd_par = nr_iidopd_par_tab[iid_mode]; } ps->enable_icc = get_bits1(gb); if (ps->enable_icc) { diff -r b9f69606a094 -r 747ea58d1ac6 ps.h --- a/ps.h Sun Jun 20 13:00:24 2010 +0000 +++ b/ps.h Sun Jun 20 17:15:28 2010 +0000 @@ -37,7 +37,6 @@ typedef struct { int start; int enable_iid; - int iid_mode; int iid_quant; int nr_iid_par; int nr_ipdopd_par;