virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

Merge commit '14efbe694ac5beff98f5c5e652c166603f1738cf'

Browse Source 
* commit '14efbe694ac5beff98f5c5e652c166603f1738cf':
  bfin: dsputil: Drop broken vsad bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-14 01:42:42 +01:00
commit c686cf23aa
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/bfin/dsputil_bfin.c
View File

@ -57,15 +57,6 @@ static int bfin_pix_abs16 (void *c, uint8_t *blk1, uint8_t *blk2, int line_size,
return ff_bfin_z_sad16x16 (blk1,blk2,line_size,line_size,h);
}
static int bfin_vsad_intra16 (void *c, uint8_t *blk1, uint8_t *dummy, int stride, int h) {
return ff_bfin_z_sad16x16 (blk1,blk1+stride,stride<<1,stride<<1,h);
}
static int bfin_vsad (void *c, uint8_t *blk1, uint8_t *blk2, int stride, int h) {
return ff_bfin_z_sad16x16 (blk1,blk1+stride,stride<<1,stride<<1,h)
+ ff_bfin_z_sad16x16 (blk2,blk2+stride,stride<<1,stride<<1,h);
}
static uint8_t vtmp_blk[256] attribute_l1_data_b;
static int bfin_pix_abs16_x2 (void *c, uint8_t *blk1, uint8_t *blk2, int line_size, int h)
@ -138,9 +129,6 @@ av_cold void ff_dsputil_init_bfin(DSPContext *c, AVCodecContext *avctx)
c->sad[0] = bfin_pix_abs16;
c->sad[1] = bfin_pix_abs8;
/* c->vsad[0] = bfin_vsad; */
/* c->vsad[4] = bfin_vsad_intra16; */
/* TODO [0] 16 [1] 8 */
c->pix_abs[0][0] = bfin_pix_abs16;
c->pix_abs[0][1] = bfin_pix_abs16_x2;