From 296710117315c2757a92ca3e689e33809b0b4984 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 11 Aug 2008 03:08:02 +0000 Subject: [PATCH] The deblock filter does not need all the intra availability stuff so do not recalculate it. Originally committed as revision 14689 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 746c28a228..6f81650c55 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -204,7 +204,6 @@ static void fill_caches(H264Context *h, int mb_type, int for_deblock){ topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; 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)){ int type_mask= h->pps.constrained_intra_pred ? IS_INTRA(-1) : -1; @@ -285,6 +284,7 @@ static void fill_caches(H264Context *h, int mb_type, int for_deblock){ } } } + } /*