From 5cc5d9bf29437264002344eea691b18a56db0a8a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 18 Jan 2010 23:27:53 +0000 Subject: [PATCH] Remove unneeded for_deblock check, this code was alraedy under for_deblock. Originally committed as revision 21304 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 8e2b7763d5..19717079c3 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -866,7 +866,7 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; - if(IS_INTRA(mb_type) && !for_deblock){ + if(IS_INTRA(mb_type)){ int type_mask= h->pps.constrained_intra_pred ? IS_INTRA(-1) : -1; h->topleft_samples_available= h->top_samples_available=