ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/x86/dsputilenc_mmx.c

 /*
  * MMX optimized DSP utils
  * Copyright (c) 2000, 2001 Fabrice Bellard
  * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 1045 matching lines @@
     "movhlps "#a", "#t"               \n\t"\
     "paddusw "#t", "#a"               \n\t"\
     "pshuflw $0x0E, "#a", "#t"        \n\t"\
     "paddusw "#t", "#a"               \n\t"\
     "pshuflw $0x01, "#a", "#t"        \n\t"\
     "paddusw "#t", "#a"               \n\t"\
     "movd "#a", "#dst"                \n\t"\
 
 #define HADAMARD8_DIFF_MMX(cpu) \
 static int hadamard8_diff_##cpu(void *s, uint8_t *src1, uint8_t *src2, int stride, int h){\
-    DECLARE_ALIGNED_8(uint64_t, temp)[13];\
+    DECLARE_ALIGNED(8, uint64_t, temp)[13];\
     int sum;\
 \
     assert(h==8);\
 \
     DIFF_PIXELS_4x8(src1, src2, stride, temp[0]);\
 \
     __asm__ volatile(\
         HADAMARD48\
 \
         "movq %%mm7, 96(%1)             \n\t"\
@@ skipping 62 matching lines @@
 \
         : "=r" (sum)\
         : "r"(temp)\
     );\
     return sum&0xFFFF;\
 }\
 WRAPPER8_16_SQ(hadamard8_diff_##cpu, hadamard8_diff16_##cpu)
 
 #define HADAMARD8_DIFF_SSE2(cpu) \
 static int hadamard8_diff_##cpu(void *s, uint8_t *src1, uint8_t *src2, int stride, int h){\
-    DECLARE_ALIGNED_16(uint64_t, temp)[4];\
+    DECLARE_ALIGNED(16, uint64_t, temp)[4];\
     int sum;\
 \
     assert(h==8);\
 \
     DIFF_PIXELS_8x8(src1, src2, stride, temp[0]);\
 \
     __asm__ volatile(\
         HADAMARD8(%%xmm0, %%xmm1, %%xmm2, %%xmm3, %%xmm4, %%xmm5, %%xmm6, %%xmm7)\
         TRANSPOSE8(%%xmm0, %%xmm1, %%xmm2, %%xmm3, %%xmm4, %%xmm5, %%xmm6, %%xmm7, (%1))\
         HADAMARD8(%%xmm0, %%xmm5, %%xmm7, %%xmm3, %%xmm6, %%xmm4, %%xmm2, %%xmm1)\
@@ skipping 181 matching lines @@
 #include "dsputil_mmx_qns_template.c"
 
 #undef DEF
 #undef SET_RND
 #undef SCALE_OFFSET
 #undef PMULHRW
 #undef PHADDD
 #endif //HAVE_SSSE3
 
 
-void ff_lpc_compute_autocorr_sse2(const int32_t *data, int len, int lag,
-                                   double *autoc);
-
-
 void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx)
 {
     if (mm_flags & FF_MM_MMX) {
         const int dct_algo = avctx->dct_algo;
         if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){
             if(mm_flags & FF_MM_SSE2){
                 c->fdct = ff_fdct_sse2;
             }else if(mm_flags & FF_MM_MMX2){
                 c->fdct = ff_fdct_mmx2;
             }else{
@@ skipping 68 matching lines @@
         if(mm_flags & FF_MM_3DNOW){
             if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
                 c->try_8x8basis= try_8x8basis_3dnow;
             }
             c->add_8x8basis= add_8x8basis_3dnow;
         }
     }
 
     dsputil_init_pix_mmx(c, avctx);
 }