Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 17:43:28 +0000 (19:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 17:43:28 +0000 (19:43 +0200)
* qatar/master:
  dsputil: Move DV-specific ff_zigzag248_direct table to dvdata

Conflicts:
libavcodec/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dv.c
libavcodec/dvdata.c
libavcodec/dvdata.h
libavcodec/dvenc.c

Simple merge
Simple merge
diff --cc libavcodec/dv.c
@@@ -312,13 -311,7 +312,13 @@@ av_cold int ff_dvvideo_init(AVCodecCont
      /* 248DCT setup */
      s->fdct[1]     = dsp.fdct248;
      s->idct_put[1] = ff_simple_idct248_put;  // FIXME: need to add it to DSP
 -    memcpy(s->dv_zigzag[1], ff_dv_zigzag248_direct, 64);
 +    if (avctx->lowres){
 +        for (i = 0; i < 64; i++){
-             int j = ff_zigzag248_direct[i];
++            int j = ff_dv_zigzag248_direct[i];
 +            s->dv_zigzag[1][i] = dsp.idct_permutation[(j & 7) + (j & 8) * 4 + (j & 48) / 2];
 +        }
 +    }else
-         memcpy(s->dv_zigzag[1], ff_zigzag248_direct, 64);
++        memcpy(s->dv_zigzag[1], ff_dv_zigzag248_direct, 64);
  
      s->avctx = avctx;
      avctx->chroma_sample_location = AVCHROMA_LOC_TOPLEFT;
Simple merge
Simple merge
Simple merge