diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 14:12:19 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 14:19:24 +0100 |
commit | 2830f287e2f271bcf773f645e5d9cb9aa5204f7f (patch) | |
tree | ceda9d20e4c2e19e32e1c092e36dc8558fb0f0e2 /libavcodec/wmv2.c | |
parent | bba73f5574afd3095e017f70bca1547dd43f702f (diff) | |
parent | ebfe622bb1ca57cecb932e42926745cba7161913 (diff) | |
download | ffmpeg-2830f287e2f271bcf773f645e5d9cb9aa5204f7f.tar.gz |
Merge commit 'ebfe622bb1ca57cecb932e42926745cba7161913'
* commit 'ebfe622bb1ca57cecb932e42926745cba7161913':
mpegvideo: drop support for real (non-emulated) edges
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_motion.c
libavcodec/wmv2.c
If this is slower on a major platform then it should be investigated
and potentially reverted.
See: 8fc52a5ef94712d900fc8fe7503cf9c9ba635143
See: 3969b4b861ce8152e3195e8f8c3437abd273b90a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmv2.c')
-rw-r--r-- | libavcodec/wmv2.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 30c8bc1d3a..b8df6ca065 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -117,17 +117,17 @@ void ff_mspel_motion(MpegEncContext *s, uvlinesize = s->uvlinesize; ptr = ref_picture[0] + (src_y * linesize) + src_x; - 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, - 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; - } + 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, + 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; + } s->dsp.put_mspel_pixels_tab[dxy](dest_y , ptr , linesize); s->dsp.put_mspel_pixels_tab[dxy](dest_y+8 , ptr+8 , linesize); |