aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-27 00:15:55 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-27 00:15:55 +0000
commit8652e44acd8c836d27e436e2714b898d020524cf (patch)
treed0fa9a8103bc81815e10e9a7128e5e4343c8742f /libavcodec
parent599fe45b8df52cd37c9db1fd292a9359b2f8ab51 (diff)
downloadffmpeg-8652e44acd8c836d27e436e2714b898d020524cf.tar.gz
Simplify left_xy init
Originally committed as revision 21470 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 2e6a6b9bd5..e03e0e439c 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -1144,16 +1144,14 @@ static int fill_filter_caches(H264Context *h, int mb_type){
const int curr_mb_field_flag = IS_INTERLACED(mb_type);
if(s->mb_y&1){
if (left_mb_field_flag != curr_mb_field_flag) {
- left_xy[0] = mb_xy - s->mb_stride - 1;
- left_xy[1] = mb_xy - 1;
+ left_xy[0] -= s->mb_stride;
}
}else{
if(curr_mb_field_flag){
top_xy += s->mb_stride & (((s->current_picture.mb_type[top_xy ]>>7)&1)-1);
}
if (left_mb_field_flag != curr_mb_field_flag) {
- left_xy[0] = mb_xy - 1;
- left_xy[1] = mb_xy + s->mb_stride - 1;
+ left_xy[1] += s->mb_stride;
}
}
}