From 284b041b1c4f96686676d57e05445e9e9331d359 Mon Sep 17 00:00:00 2001
From: Alex Converse <alex.converse@gmail.com>
Date: Sun, 20 Jun 2010 17:15:28 +0000
Subject: [PATCH] Remove iid_mode from the PS context.

Originally committed as revision 23658 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/ps.c | 12 ++++++------
 libavcodec/ps.h |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libavcodec/ps.c b/libavcodec/ps.c
index 6f4860fa60..2010f004a5 100644
--- a/libavcodec/ps.c
+++ b/libavcodec/ps.c
@@ -156,15 +156,15 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host, PSContext *ps
     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 --git a/libavcodec/ps.h b/libavcodec/ps.h
index 41c925ccf7..61fbf53153 100644
--- a/libavcodec/ps.h
+++ b/libavcodec/ps.h
@@ -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;