Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'

* commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab':
  mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext

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

diff --cc libavcodec/mpeg4video.h
Simple merge

diff --cc libavcodec/mpeg4videodec.c
index 7d977e1,b1bcd38..ee48cb6
--- 1/libavcodec/mpeg4videodec.c
--- 2/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@@ -472,8 -465,7 +472,8 @@@ int ff_mpeg4_decode_video_packet_header
              }
          }
      }
-     if (s->new_pred)
 -    // FIXME new-pred stuff
++    if (ctx->new_pred)
 +        decode_new_pred(ctx, &s->gb);
  
      return 0;
  }
@@@ -2318,9 -2143,6 +2318,9 @@@ static int decode_vop_header(Mpeg4DecCo
              av_log(s->avctx, AV_LOG_ERROR, "vop not coded\n");
          return FRAME_SKIPPED;
      }
-     if (s->new_pred)
++    if (ctx->new_pred)
 +        decode_new_pred(ctx, gb);
 +
      if (ctx->shape != BIN_ONLY_SHAPE &&
                      (s->pict_type == AV_PICTURE_TYPE_P ||
                       (s->pict_type == AV_PICTURE_TYPE_S &&

diff --cc libavcodec/mpegvideo.h
Simple merge