>From 5b695f07a5c62149bf2477efd02150e74ea12c36 Mon Sep 17 00:00:00 2001
From: Zeng Zhaoxiu <zhaoxiu.z...@gmail.com>
Date: Sat, 7 Mar 2015 17:41:51 +0800
Subject: [PATCH 4/5] avcodec/vc1_mc: simplifying
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.z...@gmail.com>
---
libavcodec/vc1_mc.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/libavcodec/vc1_mc.c b/libavcodec/vc1_mc.c
index 88473ea..05d6e20 100644
--- a/libavcodec/vc1_mc.c
+++ b/libavcodec/vc1_mc.c
@@ -403,13 +403,7 @@ void ff_vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int
avg)
} else {
src_x = av_clip(src_x, -17, s->avctx->coded_width);
- if (v->fcm == ILACE_FRAME) {
- if (src_y & 1)
- src_y = av_clip(src_y, -17, s->avctx->coded_height + 1);
- else
- src_y = av_clip(src_y, -18, s->avctx->coded_height);
- } else {
- src_y = av_clip(src_y, -18, s->avctx->coded_height + 1);
- }
+ src_y = av_clip(src_y, -17 - (v->fcm != ILACE_FRAME || !(src_y & 1)),
+ s->avctx->coded_height + (v->fcm != ILACE_FRAME
|| (src_y & 1)));
}
srcY += src_y * s->linesize + src_x;
--
2.1.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
