[FFmpeg-cvslog] r21304 - trunk/libavcodec/h264.h

[michael]

Author: michael
Date: Tue Jan 19 00:27:53 2010
New Revision: 21304

Log:
Remove unneeded for_deblock check, this code was alraedy under for_deblock.

Modified:
   trunk/libavcodec/h264.h

Modified: trunk/libavcodec/h264.h
==============================================================================
--- trunk/libavcodec/h264.h	Tue Jan 19 00:12:55 2010	(r21303)
+++ trunk/libavcodec/h264.h	Tue Jan 19 00:27:53 2010	(r21304)
@@ -866,7 +866,7 @@ static av_always_inline int fill_caches(
         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=