Merge commit 'd6acefe05862af244fd5a30ae946ed507c063994'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 16:26:37 +0000 (17:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 16:26:37 +0000 (17:26 +0100)
* commit 'd6acefe05862af244fd5a30ae946ed507c063994':
  proresenc: Drop unnecessary DCT permutation bits

Conflicts:
libavcodec/proresenc_kostya.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/proresdsp.c
libavcodec/proresdsp.h
libavcodec/proresenc_kostya.c

@@@ -84,10 -84,7 +84,7 @@@ av_cold void ff_proresdsp_init(ProresDS
      ff_init_scantable_permutation(dsp->idct_permutation,
                                    dsp->idct_permutation_type);
  #endif
 -#if CONFIG_PRORES_ENCODER
 +#if CONFIG_PRORES_KS_ENCODER
      dsp->fdct                 = prores_fdct_c;
-     dsp->dct_permutation_type = FF_NO_IDCT_PERM;
-     ff_init_scantable_permutation(dsp->dct_permutation,
-                                   dsp->dct_permutation_type);
  #endif
  }
Simple merge
@@@ -1077,10 -1079,9 +1077,9 @@@ static av_cold int encode_init(AVCodecC
      if (!avctx->coded_frame)
          return AVERROR(ENOMEM);
  
 -    ff_proresdsp_init(&ctx->dsp);
 +    ff_proresdsp_init(&ctx->dsp, avctx);
-     ff_init_scantable(ctx->dsp.dct_permutation, &ctx->scantable,
-                       interlaced ? ff_prores_interlaced_scan
-                                  : ff_prores_progressive_scan);
+     ctx->scantable = interlaced ? ff_prores_interlaced_scan
+                                 : ff_prores_progressive_scan;
  
      mps = ctx->mbs_per_slice;
      if (mps & (mps - 1)) {