summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-08-11 03:08:02 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-08-11 03:08:02 +0000
commit296710117315c2757a92ca3e689e33809b0b4984 (patch)
tree55fa7d30d7846959fb0ba2681ab6b941e94dcd28 /libavcodec/h264.c
parentfaa7e3946690c5b42cb815d7c48cc9a91f89c9bd (diff)
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
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
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){
}
}
}
+ }
/*