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/cavs.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/cavs.c')
| -rw-r--r-- | libavcodec/cavs.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 42b82e453c..cc544293d1 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -407,8 +407,9 @@ static inline void mc_dir_part(AVSContext *h, AVFrame *pic, int chroma_height, full_my < 0 - extra_height || full_mx + 16 /* FIXME */ > pic_width + extra_width || full_my + 16 /* FIXME */ > pic_height + extra_height) { - h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->l_stride, - src_y - 2 - 2 * h->l_stride, h->l_stride, + h->vdsp.emulated_edge_mc(h->edge_emu_buffer, + src_y - 2 - 2 * h->l_stride, + h->l_stride, h->l_stride, 16 + 5, 16 + 5 /* FIXME */, full_mx - 2, full_my - 2, pic_width, pic_height); @@ -420,8 +421,8 @@ static inline void mc_dir_part(AVSContext *h, AVFrame *pic, int chroma_height, qpix_op[luma_xy](dest_y, src_y, h->l_stride); if (emu) { - h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->c_stride, src_cb, - h->c_stride, + h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cb, + h->c_stride, h->c_stride, 9, 9 /* FIXME */, mx >> 3, my >> 3, pic_width >> 1, pic_height >> 1); @@ -430,8 +431,8 @@ static inline void mc_dir_part(AVSContext *h, AVFrame *pic, int chroma_height, chroma_op(dest_cb, src_cb, h->c_stride, chroma_height, mx & 7, my & 7); if (emu) { - h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->c_stride, src_cr, - h->c_stride, + h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cr, + h->c_stride, h->c_stride, 9, 9 /* FIXME */, mx >> 3, my >> 3, pic_width >> 1, pic_height >> 1); |