@@ -73,6 +73,8 @@ typedef struct Mpeg4DecContext {

     ///< time distance of first I -> B, used for interlaced b frames

     int t_frame;

+    int new_pred;

+

     /* bug workarounds */

     int divx_version;

     int divx_build;

@@ -1940,8 +1940,8 @@ no_cplx_est:

             ctx->rvlc = get_bits1(gb);

         if (vo_ver_id != 1) {

-            s->new_pred = get_bits1(gb);

-            if (s->new_pred) {

+            ctx->new_pred = get_bits1(gb);

+            if (ctx->new_pred) {

                 av_log(s->avctx, AV_LOG_ERROR, "new pred not supported\n");

                 skip_bits(gb, 2); /* requested upstream message type */

                 skip_bits1(gb);   /* newpred segment type */

@@ -1950,7 +1950,7 @@ no_cplx_est:

                 av_log(s->avctx, AV_LOG_ERROR,

                        "reduced resolution VOP not supported\n");

         } else {

-            s->new_pred        = 0;

+            ctx->new_pred = 0;

         }

         s->scalability = get_bits1(gb);

@@ -592,7 +592,6 @@ typedef struct MpegEncContext {

     int scalability;

     int hierachy_type;

     int enhancement_type;

-    int new_pred;

     int aspect_ratio_info; //FIXME remove

     int sprite_warping_accuracy;

     int data_partitioning;           ///< data partitioning flag from header