Merge commit '513d849bb605d3d862da1ada709bd2ca1ac68f58'

* commit '513d849bb605d3d862da1ada709bd2ca1ac68f58':
  mpeg4videodec: move num_sprite_warping_points from MpegEncContext to Mpeg4DecContext

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

diff --cc libavcodec/mpeg4video.h
Simple merge

diff --cc libavcodec/mpeg4videodec.c
index 5ccd18a,f8bb54c..befb91d
--- 1/libavcodec/mpeg4videodec.c
--- 2/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@@ -2425,13 -2236,13 +2425,13 @@@ static int decode_vop_header(Mpeg4DecCo
  
          if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
              av_log(s->avctx, AV_LOG_DEBUG,
 -                   "qp:%d fc:%d,%d %s size:%d pro:%d alt:%d top:%d %spel part:%d resync:%d w:%d a:%d rnd:%d vot:%d%s dc:%d ce:%d/%d/%d\n",
 +                   "qp:%d fc:%d,%d %s size:%d pro:%d alt:%d top:%d %spel part:%d resync:%d w:%d a:%d rnd:%d vot:%d%s dc:%d ce:%d/%d/%d time:%"PRId64" tincr:%d\n",
                     s->qscale, s->f_code, s->b_code,
                     s->pict_type == AV_PICTURE_TYPE_I ? "I" : (s->pict_type == AV_PICTURE_TYPE_P ? "P" : (s->pict_type == AV_PICTURE_TYPE_B ? "B" : "S")),
 -                   gb->size_in_bits, s->progressive_sequence, s->alternate_scan,
 +                   gb->size_in_bits,s->progressive_sequence, s->alternate_scan,
                     s->top_field_first, s->quarter_sample ? "q" : "h",
                     s->data_partitioning, ctx->resync_marker,
-                    s->num_sprite_warping_points, s->sprite_warping_accuracy,
+                    ctx->num_sprite_warping_points, s->sprite_warping_accuracy,
                     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,

diff --cc libavcodec/mpegvideo.h
Simple merge

diff --cc libavcodec/vaapi_mpeg4.c
Simple merge