Merge commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9'

* commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9':
  x86: qpel: Move fullpel and l2 functions to a separate file
  bfin: Make vp3 functions static

Conflicts:
	libavcodec/bfin/vp3_bfin.c
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/bfin/vp3_bfin.c

@@ -28,7 +28,7 @@
 #include "vp3_bfin.h"
 
 /* Intra iDCT offset 128 */
-static void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, int16_t *block)
+static void bfin_vp3_idct_put(uint8_t *dest, int line_size, int16_t *block)
 {
     uint8_t *cm = ff_cropTbl + MAX_NEG_CROP + 128;
     int i,j;
@@ -43,7 +43,7 @@ static void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, int16_t *block)
 }
 
 /* Inter iDCT */
-static void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, int16_t *block)
+static void bfin_vp3_idct_add(uint8_t *dest, int line_size, int16_t *block)
 {
     ff_bfin_vp3_idct (block);
     ff_bfin_add_pixels_clamped (block, dest, line_size);
@@ -56,7 +56,7 @@ av_cold void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags)
     // FIXME: these functions are disabled because they expect unpermutated
     // IDCT coefficients as input, but the coefficients are transposed
 //     if (!(flags & CODEC_FLAG_BITEXACT)) {
-//         c->idct_add = ff_bfin_vp3_idct_add;
-//         c->idct_put = ff_bfin_vp3_idct_put;
+//         c->idct_add = bfin_vp3_idct_add;
+//         c->idct_put = bfin_vp3_idct_put;
 //     }
 }