Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: x86: Move ff_inv_zigzag_direct16 table init to mpegvideo

If someone optimizes dct_quantize for non x86 SIMD, then this
probably needs to be reverted.

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

diff --cc libavcodec/dsputil.c
Simple merge

diff --cc libavcodec/x86/mpegvideoenc.c
index 97aa3c7,3167ea6..77fc163
--- 1/libavcodec/x86/mpegvideoenc.c
--- 2/libavcodec/x86/mpegvideoenc.c
+++ b/libavcodec/x86/mpegvideoenc.c
@@@ -81,9 -82,13 +82,13 @@@ DECLARE_ALIGNED(16, static uint16_t, in
  #include "mpegvideoenc_template.c"
  #endif /* HAVE_SSSE3_INLINE */
  
 -av_cold void ff_MPV_encode_init_x86(MpegEncContext *s)
 +av_cold void ff_dct_encode_init_x86(MpegEncContext *s)
  {
      const int dct_algo = s->avctx->dct_algo;
+     int i;
+ 
+     for (i = 0; i < 64; i++)
+         inv_zigzag_direct16[ff_zigzag_direct[i]] = i + 1;
  
      if (dct_algo == FF_DCT_AUTO || dct_algo == FF_DCT_MMX) {
  #if HAVE_MMX_INLINE

diff --cc libavcodec/x86/mpegvideoenc_template.c
Simple merge