Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 13:35:36 +0000 (14:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 13:35:49 +0000 (14:35 +0100)
* qatar/master:
  dsputil: x86: Fix compile error
  dsputil: x86: Convert h263 loop filter to yasm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_mmx.c

Simple merge
@@@ -1801,21 -1464,34 +1632,21 @@@ static av_cold void dsputil_init_mmx(DS
          SET_HPEL_FUNCS(put,        [1],  8, mmx);
          SET_HPEL_FUNCS(put_no_rnd, [1],  8, mmx);
          SET_HPEL_FUNCS(avg,        [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 CONFIG_VIDEODSP && (ARCH_X86_32 || !HAVE_YASM)
      c->gmc = gmc_mmx;
 +#endif
  
      c->add_bytes = add_bytes_mmx;
+ #endif /* HAVE_INLINE_ASM */
  
+ #if HAVE_YASM
      if (CONFIG_H263_DECODER || CONFIG_H263_ENCODER) {
-         c->h263_v_loop_filter = h263_v_loop_filter_mmx;
-         c->h263_h_loop_filter = h263_h_loop_filter_mmx;
+         c->h263_v_loop_filter = ff_h263_v_loop_filter_mmx;
+         c->h263_h_loop_filter = ff_h263_h_loop_filter_mmx;
      }
- #endif /* HAVE_INLINE_ASM */
  
- #if HAVE_YASM
      c->vector_clip_int32 = ff_vector_clip_int32_mmx;
  #endif