X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fh264.c;h=cab28415b5da03d5d1d36632de4296b43d601b54;hp=99e104e2f8314349f4634c0e7af922bc185cc5b3;hb=b69378e2955b8a1efceb4867719b7da1200702e5;hpb=c0ad72a787b1e2ade82d8313c2c18b342a9a23c7 diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 99e104e2f8..cab28415b5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3024,8 +3024,18 @@ static inline void xchg_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_c MpegEncContext * const s = &h->s; int temp8, i; uint64_t temp64; - int deblock_left = (s->mb_x > 0); - int deblock_top = (s->mb_y > 0); + int deblock_left; + int deblock_top; + int mb_xy; + + if(h->deblocking_filter == 2) { + mb_xy = s->mb_x + s->mb_y*s->mb_stride; + 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]; + } else { + deblock_left = (s->mb_x > 0); + deblock_top = (s->mb_y > 0); + } src_y -= linesize + 1; src_cb -= uvlinesize + 1;