Commit 57001949 authored by alexc's avatar alexc

Remove iid_mode from the PS context.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@23658 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e7ba2d6c
...@@ -156,15 +156,15 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host, PSContext *ps ...@@ -156,15 +156,15 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host, PSContext *ps
if (header) { //enable_ps_header if (header) { //enable_ps_header
ps->enable_iid = get_bits1(gb); ps->enable_iid = get_bits1(gb);
if (ps->enable_iid) { if (ps->enable_iid) {
ps->iid_mode = get_bits(gb, 3); int iid_mode = get_bits(gb, 3);
if (ps->iid_mode > 5) { if (iid_mode > 5) {
av_log(avctx, AV_LOG_ERROR, "iid_mode %d is reserved.\n", av_log(avctx, AV_LOG_ERROR, "iid_mode %d is reserved.\n",
ps->iid_mode); iid_mode);
goto err; goto err;
} }
ps->nr_iid_par = nr_iidicc_par_tab[ps->iid_mode]; ps->nr_iid_par = nr_iidicc_par_tab[iid_mode];
ps->iid_quant = ps->iid_mode > 2; ps->iid_quant = iid_mode > 2;
ps->nr_ipdopd_par = nr_iidopd_par_tab[ps->iid_mode]; ps->nr_ipdopd_par = nr_iidopd_par_tab[iid_mode];
} }
ps->enable_icc = get_bits1(gb); ps->enable_icc = get_bits1(gb);
if (ps->enable_icc) { if (ps->enable_icc) {
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
typedef struct { typedef struct {
int start; int start;
int enable_iid; int enable_iid;
int iid_mode;
int iid_quant; int iid_quant;
int nr_iid_par; int nr_iid_par;
int nr_ipdopd_par; int nr_ipdopd_par;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment