aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-18 23:27:53 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-18 23:27:53 +0000
commit5cc5d9bf29437264002344eea691b18a56db0a8a (patch)
treef50f2e2c3eeff457b06182419d4a21688160eb55 /libavcodec
parentc8a4ae00dd95350d583164116153e2c5b9e4276d (diff)
downloadffmpeg-5cc5d9bf29437264002344eea691b18a56db0a8a.tar.gz
Remove unneeded for_deblock check, this code was alraedy under for_deblock.
Originally committed as revision 21304 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.h2
1 files changed, 1 insertions, 1 deletions
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=