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/wmv2.c | |
| parent | e28130bcaf48281b431ea611a546e7520bb90dda (diff) | |
| parent | 458446acfa1441d283dacf9e6e545beb083b8bb0 (diff) | |
| download | ffmpeg-streaming-91e00c4a785d3f4cd44f1044d3e7b1b34fee8b5c.zip ffmpeg-streaming-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/wmv2.c')
| -rw-r--r-- | libavcodec/wmv2.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 8d30259..30c8bc1 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -119,9 +119,11 @@ void ff_mspel_motion(MpegEncContext *s, if(src_x<1 || src_y<1 || src_x + 17 >= s->h_edge_pos || src_y + h+1 >= v_edge_pos){ - s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->linesize, - ptr - 1 - s->linesize, s->linesize, 19, 19, - src_x-1, src_y-1, + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, + ptr - 1 - s->linesize, + s->linesize, s->linesize, + 19, 19, + src_x - 1, src_y - 1, s->h_edge_pos, s->v_edge_pos); ptr= s->edge_emu_buffer + 1 + s->linesize; emu=1; @@ -161,18 +163,22 @@ void ff_mspel_motion(MpegEncContext *s, offset = (src_y * uvlinesize) + src_x; ptr = ref_picture[1] + offset; if(emu){ - s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->uvlinesize, - ptr, s->uvlinesize, 9, 9, src_x, src_y, - s->h_edge_pos>>1, s->v_edge_pos>>1); + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr, + s->uvlinesize, s->uvlinesize, + 9, 9, + src_x, src_y, + s->h_edge_pos >> 1, s->v_edge_pos >> 1); ptr= s->edge_emu_buffer; } pix_op[1][dxy](dest_cb, ptr, uvlinesize, h >> 1); ptr = ref_picture[2] + offset; if(emu){ - s->vdsp.emulated_edge_mc(s->edge_emu_buffer, s->uvlinesize, - ptr, s->uvlinesize, 9, 9, src_x, src_y, - s->h_edge_pos>>1, s->v_edge_pos>>1); + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, ptr, + s->uvlinesize, s->uvlinesize, + 9, 9, + src_x, src_y, + s->h_edge_pos >> 1, s->v_edge_pos >> 1); ptr= s->edge_emu_buffer; } pix_op[1][dxy](dest_cr, ptr, uvlinesize, h >> 1); |
