diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2007-05-06 06:46:20 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2007-05-06 06:46:20 +0000 |
| commit | cd66ddb6b00a9f7eae2e414cc54d9e9ab39dba6e (patch) | |
| tree | be6f2d0ce0037d59119bea4bc9eec1b555505527 /libavcodec/vp6.c | |
| parent | 6ec48185259a0afecfcbed229408349f4d8d1ab4 (diff) | |
| download | ffmpeg-cd66ddb6b00a9f7eae2e414cc54d9e9ab39dba6e.tar.gz | |
simplify
Originally committed as revision 8908 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp6.c')
| -rw-r--r-- | libavcodec/vp6.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 692ebe92c4..6042dbbee1 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -474,22 +474,16 @@ static void vp6_filter(vp56_context_t *s, uint8_t *dst, uint8_t *src, } else if (!x8) { /* above or below combine */ vp6_filter_hv4(dst, src+offset1, stride, stride, vp6_block_copy_filter[select][y8]); - } else if ((mv.x^mv.y) >> 31) { /* lower-left or upper-right combine */ - vp6_filter_diag4(dst, src+offset1-1, stride, - vp6_block_copy_filter[select][x8], - vp6_block_copy_filter[select][y8]); - } else { /* lower-right or upper-left combine */ - vp6_filter_diag4(dst, src+offset1, stride, + } else { + vp6_filter_diag4(dst, src+offset1 + ((mv.x^mv.y)>>31), stride, vp6_block_copy_filter[select][x8], vp6_block_copy_filter[select][y8]); } } else { if (!x8 || !y8) { s->dsp.put_h264_chroma_pixels_tab[0](dst, src+offset1, stride, 8, x8, y8); - } else if ((mv.x^mv.y) >> 31) { /* lower-left or upper-right combine */ - vp6_filter_diag2(s, dst, src+offset1-1, stride, x8, y8); - } else { /* lower-right or upper-left combine */ - vp6_filter_diag2(s, dst, src+offset1, stride, x8, y8); + } else { + vp6_filter_diag2(s, dst, src+offset1 + ((mv.x^mv.y)>>31), stride, x8, y8); } } } |