Merge commit '58c120a9290eef057dbf26761a4f89b7f67bbde1'

* commit '58c120a9290eef057dbf26761a4f89b7f67bbde1':
  mpeg4videodec: move scalability from MpegEncContext to Mpeg4DecContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/mpeg4video.h
Simple merge

diff --cc libavcodec/mpeg4videodec.c
index 8a934b5,2e320cd..bda8c5e
--- 1/libavcodec/mpeg4videodec.c
--- 2/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@@ -2022,17 -1984,6 +2022,17 @@@ no_cplx_est
          }
      }
  
-                s->scalability ? "scalability " :"" , s->quarter_sample ? "qpel " : "",
 +    if (s->avctx->debug&FF_DEBUG_PICT_INFO) {
 +        av_log(s->avctx, AV_LOG_DEBUG, "tb %d/%d, tincrbits:%d, qp_prec:%d, ps:%d,  %s%s%s%s\n",
 +               s->avctx->time_base.num, s->avctx->time_base.den,
 +               ctx->time_increment_bits,
 +               s->quant_precision,
 +               s->progressive_sequence,
++               ctx->scalability ? "scalability " :"" , s->quarter_sample ? "qpel " : "",
 +               s->data_partitioning ? "partition " : "", ctx->rvlc ? "rvlc " : ""
 +        );
 +    }
 +
      return 0;
  }
  
@@@ -2435,13 -2246,10 +2435,13 @@@ static int decode_vop_header(Mpeg4DecCo
                     1 - s->no_rounding, s->vo_type,
                     s->vol_control_parameters ? " VOLC" : " ", s->intra_dc_threshold,
                     ctx->cplx_estimation_trash_i, ctx->cplx_estimation_trash_p,
 -                   ctx->cplx_estimation_trash_b);
 +                   ctx->cplx_estimation_trash_b,
 +                   s->time,
 +                   time_increment
 +                  );
          }
  
-         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 {

diff --cc libavcodec/mpegvideo.h
Simple merge