[FFmpeg-cvslog] r23658 - in trunk/libavcodec: ps.c ps.h

[alexc]

Author: alexc
Date: Sun Jun 20 19:15:28 2010
New Revision: 23658

Log:
Remove iid_mode from the PS context.

Modified:
   trunk/libavcodec/ps.c
   trunk/libavcodec/ps.h

Modified: trunk/libavcodec/ps.c
==============================================================================
--- trunk/libavcodec/ps.c	Sun Jun 20 18:58:44 2010	(r23657)
+++ trunk/libavcodec/ps.c	Sun Jun 20 19:15:28 2010	(r23658)
@@ -156,15 +156,15 @@ int ff_ps_read_data(AVCodecContext *avct
     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) {

Modified: trunk/libavcodec/ps.h
==============================================================================
--- trunk/libavcodec/ps.h	Sun Jun 20 18:58:44 2010	(r23657)
+++ trunk/libavcodec/ps.h	Sun Jun 20 19:15:28 2010	(r23658)
@@ -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;