aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-09-25 21:44:07 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-09-25 21:44:07 +0000
commit6c8050078eccb5fefccb6d8032396ac64a0c5e68 (patch)
tree3bb0ca37a54cb8dce388b4f8020a948093bf4934
parent64e4af2ac19e7146080bf6aa2220cc2611943d1f (diff)
downloadffmpeg-6c8050078eccb5fefccb6d8032396ac64a0c5e68.tar.gz
Avoid out of picture accesses when CODEC_FLAG_EMU_EDGE is set.
Fixes issue427. Originally committed as revision 15418 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index c4a452810b..72164fa75b 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2391,7 +2391,7 @@ static inline void xchg_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_c
deblock_top = h->slice_table[mb_xy] == h->slice_table[h->top_mb_xy];
} else {
deblock_left = (s->mb_x > 0);
- deblock_top = (s->mb_y > 0);
+ deblock_top = (s->mb_y > !!MB_FIELD);
}
src_y -= linesize + 1;