diff options
| author | Anton Khirnov | 2013-12-20 11:20:24 +0100 |
|---|---|---|
| committer | Anton Khirnov | 2014-01-09 09:41:19 +0100 |
| commit | ebfe622bb1ca57cecb932e42926745cba7161913 (patch) | |
| tree | a63aa02a42854db02d71b05b97123ddc400e8df7 /libavcodec/wmv2.c | |
| parent | 952d3187d8eda7067fcd73f1d5f17837fa65eb34 (diff) | |
mpegvideo: drop support for real (non-emulated) edges
Several decoders disable those anyway and they are not measurably faster
on x86. They might be somewhat faster on other platforms due to missing
emu edge SIMD, but the gain is not large enough (and those decoders
relevant enough) to justify the added complexity.
Diffstat (limited to 'libavcodec/wmv2.c')
| -rw-r--r-- | libavcodec/wmv2.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index b3307763a0..9ba9451147 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -117,18 +117,16 @@ void ff_mspel_motion(MpegEncContext *s, uvlinesize = s->uvlinesize; ptr = ref_picture[0] + (src_y * linesize) + src_x; - if(s->flags&CODEC_FLAG_EMU_EDGE){ - 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); |