aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-02-18 12:37:43 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-02-18 12:37:43 +0000
commit024bf79fe0c10ef855c4ea78041c83b9c815c78f (patch)
tree9a2f1145c0a238224d21d1963df285cfec3dc0f2
parent90a5849efd31458b0cd16a52b7b0d8ede38c4129 (diff)
downloadffmpeg-024bf79fe0c10ef855c4ea78041c83b9c815c78f.tar.gz
Simplify deblock_left/top condition for deblocking_filter=2
Originally committed as revision 21876 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 6b42cbbcf2..f0abd6bc00 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -996,9 +996,8 @@ static inline void xchg_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_c
}
if(h->deblocking_filter == 2) {
- mb_xy = h->mb_xy;
- deblock_left = h->slice_table[mb_xy] == h->slice_table[mb_xy - 1];
- deblock_top = h->slice_table[mb_xy] == h->slice_table[h->top_mb_xy];
+ deblock_left = h->left_type[0];
+ deblock_top = h->top_type;
} else {
deblock_left = (s->mb_x > 0);
deblock_top = (s->mb_y > !!MB_FIELD);