diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 09:57:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 10:01:54 +0200 |
| commit | 3c6621708b9392cd8a11dab6bb9e98f1804dcf47 (patch) | |
| tree | 15448e4fb4e74679163dd334cf37fccb56a3401a | |
| parent | 23de9e91df1c855a89a468ee7cf203dcf0bab41f (diff) | |
| parent | 8071264f2196d71ff49c3944c33f8d3d83f548f1 (diff) | |
| download | ffmpeg-3c6621708b9392cd8a11dab6bb9e98f1804dcf47.tar.gz | |
Merge commit '8071264f2196d71ff49c3944c33f8d3d83f548f1'
* 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>
| -rw-r--r-- | libavcodec/vp56.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 6bf391c075..c7072956de 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -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, */ /* so copy a 16x12 block */ s->hdsp.put_pixels_tab[0][0](s->edge_emu_buffer, - src + s->block_offset[b] + (dy-2)*stride + (dx-2), - stride, 12); + src + s->block_offset[b] + (dy-2)*stride + (dx-2), + stride, 12); src_block = s->edge_emu_buffer; src_offset = 2 + 2*stride; } 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]; off = s->block_offset[b]; s->hdsp.put_pixels_tab[1][0](frame_current->data[plane] + off, - frame_ref->data[plane] + off, - s->stride[plane], 8); + frame_ref->data[plane] + off, + s->stride[plane], 8); s->vp3dsp.idct_add(frame_current->data[plane] + off, s->stride[plane], s->block_coeff[b]); } |