Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 16:52:21 +0000 (17:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 16:52:21 +0000 (17:52 +0100)
* commit '32ff6432284f713e9f837ee5b36fc8e9f1902836':
  dsputil: remove avg_no_rnd_pixels8.

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/alpha/dsputil_alpha.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/sh4/dsputil_align.c
libavcodec/sparc/dsputil_vis.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_rnd_template.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -2058,12 -1919,24 +2060,11 @@@ static void dsputil_init_mmx(DSPContex
          SET_HPEL_FUNCS(put,        1,  8, mmx);
          SET_HPEL_FUNCS(put_no_rnd, 1,  8, mmx);
          SET_HPEL_FUNCS(avg,        1,  8, mmx);
-         SET_HPEL_FUNCS(avg_no_rnd, 1,  8, mmx);
 -
 -        switch (avctx->idct_algo) {
 -        case FF_IDCT_AUTO:
 -        case FF_IDCT_SIMPLEMMX:
 -            c->idct_put              = ff_simple_idct_put_mmx;
 -            c->idct_add              = ff_simple_idct_add_mmx;
 -            c->idct                  = ff_simple_idct_mmx;
 -            c->idct_permutation_type = FF_SIMPLE_IDCT_PERM;
 -            break;
 -        case FF_IDCT_XVIDMMX:
 -            c->idct_put              = ff_idct_xvid_mmx_put;
 -            c->idct_add              = ff_idct_xvid_mmx_add;
 -            c->idct                  = ff_idct_xvid_mmx;
 -            break;
 -        }
      }
  
 +#if ARCH_X86_32 || !HAVE_YASM
      c->gmc = gmc_mmx;
 +#endif
  
      c->add_bytes = add_bytes_mmx;
  
Simple merge