virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-04-08 12:40:26 +02:00
commit 5f49e92eb9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/bfin/vp3_bfin.c
View File

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