diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-15 13:56:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-15 15:07:10 +0100 |
| commit | 91e00c4a785d3f4cd44f1044d3e7b1b34fee8b5c (patch) | |
| tree | a866df7014974a63c167522f426dc53596d3c77b /libavcodec/vp56.c | |
| parent | e28130bcaf48281b431ea611a546e7520bb90dda (diff) | |
| parent | 458446acfa1441d283dacf9e6e545beb083b8bb0 (diff) | |
| download | ffmpeg-91e00c4a785d3f4cd44f1044d3e7b1b34fee8b5c.tar.gz | |
Merge commit '458446acfa1441d283dacf9e6e545beb083b8bb0'
* commit '458446acfa1441d283dacf9e6e545beb083b8bb0':
lavc: Edge emulation with dst/src linesize
Conflicts:
libavcodec/cavs.c
libavcodec/h264.c
libavcodec/hevc.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/rv34.c
libavcodec/svq3.c
libavcodec/vc1dec.c
libavcodec/videodsp.h
libavcodec/videodsp_template.c
libavcodec/vp3.c
libavcodec/vp8.c
libavcodec/wmv2.c
libavcodec/x86/videodsp.asm
libavcodec/x86/videodsp_init.c
Changes to the asm are not merged, they are left for volunteers or
in their absence for later.
The changes this merge introduces are reordering of the function
arguments
See: face578d56c2d1375e40d5e2a28acc122132bc55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp56.c')
| -rw-r--r-- | libavcodec/vp56.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index b3b9e3e4e5..a0cb060d68 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -339,11 +339,12 @@ static void vp56_mc(VP56Context *s, int b, int plane, uint8_t *src, if (x<0 || x+12>=s->plane_width[plane] || y<0 || y+12>=s->plane_height[plane]) { - s->vdsp.emulated_edge_mc(s->edge_emu_buffer, stride, - src + s->block_offset[b] + (dy-2)*stride + (dx-2), - stride, 12, 12, x, y, - s->plane_width[plane], - s->plane_height[plane]); + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, + src + s->block_offset[b] + (dy-2)*stride + (dx-2), + stride, stride, + 12, 12, x, y, + s->plane_width[plane], + s->plane_height[plane]); src_block = s->edge_emu_buffer; src_offset = 2 + 2*stride; } else if (deblock_filtering) { |