har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '8071264f2196d71ff49c3944c33f8d3d83f548f1'

Browse Source 
* commit '8071264f2196d71ff49c3944c33f8d3d83f548f1':
  interplayvideo: Use hpeldsp instead of dsputil for half-pel functions
  bink: Use hpeldsp instead of dsputil for half-pel functions
  indeo3: Use hpeldsp instead of dsputil for half-pel functions
  vp56: Use hpeldsp instead of dsputil for half-pel functions
  vp3: Use hpeldsp instead of dsputil for half-pel functions

Conflicts:
	libavcodec/bink.c
	libavcodec/indeo3.c
	libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-20 09:57:00 +02:00
commit 3c6621708b
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/vp56.c
View File

@ -350,8 +350,8 @@ static void vp56_mc(VP56Context *s, int b, int plane, uint8_t *src,
/* only need a 12x12 block, but there is no such dsp function, */ /* only need a 12x12 block, but there is no such dsp function, */
/* so copy a 16x12 block */ /* so copy a 16x12 block */
s->hdsp.put_pixels_tab[0][0](s->edge_emu_buffer, s->hdsp.put_pixels_tab[0][0](s->edge_emu_buffer,
src + s->block_offset[b] + (dy-2)*stride + (dx-2), src + s->block_offset[b] + (dy-2)*stride + (dx-2),
stride, 12); stride, 12);
src_block = s->edge_emu_buffer; src_block = s->edge_emu_buffer;
src_offset = 2 + 2*stride; src_offset = 2 + 2*stride;
} else { } else {
@ -420,8 +420,8 @@ static void vp56_decode_mb(VP56Context *s, int row, int col, int is_alpha)
plane = ff_vp56_b2p[b+ab]; plane = ff_vp56_b2p[b+ab];
off = s->block_offset[b]; off = s->block_offset[b];
s->hdsp.put_pixels_tab[1][0](frame_current->data[plane] + off, s->hdsp.put_pixels_tab[1][0](frame_current->data[plane] + off,
frame_ref->data[plane] + off, frame_ref->data[plane] + off,
s->stride[plane], 8); s->stride[plane], 8);
s->vp3dsp.idct_add(frame_current->data[plane] + off, s->vp3dsp.idct_add(frame_current->data[plane] + off,
s->stride[plane], s->block_coeff[b]); s->stride[plane], s->block_coeff[b]);
} }