ffmpeg roll of source to mar 9 version...

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

Index: patched-ffmpeg-mt/libavcodec/x86/cavsdsp_mmx.c
===================================================================
--- patched-ffmpeg-mt/libavcodec/x86/cavsdsp_mmx.c	(revision 41250)
+++ patched-ffmpeg-mt/libavcodec/x86/cavsdsp_mmx.c	(working copy)
@@ -113,10 +113,10 @@
 static void cavs_idct8_add_mmx(uint8_t *dst, int16_t *block, int stride)
 {
     int i;
-    DECLARE_ALIGNED_8(int16_t, b2)[64];
+    DECLARE_ALIGNED(8, int16_t, b2)[64];
 
     for(i=0; i<2; i++){
-        DECLARE_ALIGNED_8(uint64_t, tmp);
+        DECLARE_ALIGNED(8, uint64_t, tmp);
 
         cavs_idct8_1d(block+4*i, ff_pw_4);
 
@@ -437,11 +437,6 @@
 CAVS_MC(avg_, 8, mmx2)
 CAVS_MC(avg_, 16,mmx2)
 
-void ff_put_cavs_qpel8_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride);
-void ff_avg_cavs_qpel8_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride);
-void ff_put_cavs_qpel16_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride);
-void ff_avg_cavs_qpel16_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride);
-
 void ff_cavsdsp_init_mmx2(DSPContext* c, AVCodecContext *avctx) {
 #define dspfunc(PFX, IDX, NUM) \
     c->PFX ## _pixels_tab[IDX][ 0] = ff_ ## PFX ## NUM ## _mc00_mmx2; \