Merge commit '038890740014dc33d2e2f04da7cf0a9da821264e'

* commit '038890740014dc33d2e2f04da7cf0a9da821264e':
  mpeg4videodec: move cplx_estimation_* fields from MpegEncContext to Mpeg4DecContext

Conflicts:
	libavcodec/mpeg4videodec.c

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

diff --cc libavcodec/mpeg4video.h
Simple merge

diff --cc libavcodec/mpeg4videodec.c
index 212954c,95abad0..6f93f2b
--- 1/libavcodec/mpeg4videodec.c
--- 2/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@@ -2353,16 -2175,12 +2353,16 @@@ static int decode_vop_header(Mpeg4DecCo
      // FIXME complexity estimation stuff
  
      if (ctx->shape != BIN_ONLY_SHAPE) {
-         skip_bits_long(gb, s->cplx_estimation_trash_i);
+         skip_bits_long(gb, ctx->cplx_estimation_trash_i);
          if (s->pict_type != AV_PICTURE_TYPE_I)
-             skip_bits_long(gb, s->cplx_estimation_trash_p);
+             skip_bits_long(gb, ctx->cplx_estimation_trash_p);
          if (s->pict_type == AV_PICTURE_TYPE_B)
-             skip_bits_long(gb, s->cplx_estimation_trash_b);
+             skip_bits_long(gb, ctx->cplx_estimation_trash_b);
  
 +        if (get_bits_left(gb) < 3) {
 +            av_log(s->avctx, AV_LOG_ERROR, "Header truncated\n");
 +            return -1;
 +        }
          s->intra_dc_threshold = ff_mpeg4_dc_threshold[get_bits(gb, 3)];
          if (!s->progressive_sequence) {
              s->top_field_first = get_bits1(gb);
@@@ -2436,11 -2247,8 +2436,11 @@@
                     s->num_sprite_warping_points, s->sprite_warping_accuracy,
                     1 - s->no_rounding, s->vo_type,
                     s->vol_control_parameters ? " VOLC" : " ", s->intra_dc_threshold,
-                    s->cplx_estimation_trash_i, s->cplx_estimation_trash_p,
-                    s->cplx_estimation_trash_b,
+                    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) {

diff --cc libavcodec/mpegvideo.h
Simple merge