Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'
[ffmpeg.git] / libavcodec / mpeg4videodec.c
index 8a934b5..bda8c5e 100644 (file)
@@ -1991,9 +1991,9 @@ no_cplx_est:
             ctx->new_pred = 0;
         }
 
-        s->scalability = get_bits1(gb);
+        ctx->scalability = get_bits1(gb);
 
-        if (s->scalability) {
+        if (ctx->scalability) {
             GetBitContext bak = *gb;
             int h_sampling_factor_n;
             int h_sampling_factor_m;
@@ -2013,7 +2013,7 @@ no_cplx_est:
                 v_sampling_factor_n == 0 || v_sampling_factor_m == 0) {
                 /* illegal scalability header (VERY broken encoder),
                  * trying to workaround */
-                s->scalability = 0;
+                ctx->scalability = 0;
                 *gb            = bak;
             } else
                 av_log(s->avctx, AV_LOG_ERROR, "scalability not supported\n");
@@ -2028,7 +2028,7 @@ no_cplx_est:
                ctx->time_increment_bits,
                s->quant_precision,
                s->progressive_sequence,
-               s->scalability ? "scalability " :"" , s->quarter_sample ? "qpel " : "",
+               ctx->scalability ? "scalability " :"" , s->quarter_sample ? "qpel " : "",
                s->data_partitioning ? "partition " : "", ctx->rvlc ? "rvlc " : ""
         );
     }
@@ -2441,7 +2441,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
                   );
         }
 
-        if (!s->scalability) {
+        if (!ctx->scalability) {
             if (ctx->shape != RECT_SHAPE && s->pict_type != AV_PICTURE_TYPE_I)
                 skip_bits1(gb);  // vop shape coding type
         } else {