Merge commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0'

* commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0':
  mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()

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

diff --cc libavcodec/mpegvideo.c
Simple merge

diff --cc libavcodec/mpegvideo_enc.c
index caadf17,bacec72..1f235fc
--- 1/libavcodec/mpegvideo_enc.c
--- 2/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@@ -217,24 -217,11 +217,27 @@@ static void MPV_encode_defaults(MpegEnc
      }
      s->me.mv_penalty = default_mv_penalty;
      s->fcode_tab     = default_fcode_tab;
+ 
+     s->input_picture_number  = 0;
+     s->picture_in_gop_number = 0;
  }
  
 +av_cold int ff_dct_encode_init(MpegEncContext *s) {
 +    if (ARCH_X86)
 +        ff_dct_encode_init_x86(s);
 +
 +    ff_h263dsp_init(&s->h263dsp);
 +    if (!s->dct_quantize)
 +        s->dct_quantize = ff_dct_quantize_c;
 +    if (!s->denoise_dct)
 +        s->denoise_dct  = denoise_dct_c;
 +    s->fast_dct_quantize = s->dct_quantize;
 +    if (s->avctx->trellis)
 +        s->dct_quantize  = dct_quantize_trellis_c;
 +
 +    return 0;
 +}
 +
  /* init video encoder */
  av_cold int ff_MPV_encode_init(AVCodecContext *avctx)
  {