[SCM] libav/experimental: Set top & left types for deblock in fill_caches().

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 99344d43729090ac55c81f6dd589682767c9ff03
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Jan 26 13:38:18 2010 +0000

    Set top & left types for deblock in fill_caches().
    
    Originally committed as revision 21456 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index b49f6cc..49608fb 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -285,6 +285,9 @@ typedef struct H264Context{
     int top_mb_xy;
     int left_mb_xy[2];
 
+    int top_type;
+    int left_type[2];
+
     int8_t intra4x4_pred_mode_cache[5*8];
     int8_t (*intra4x4_pred_mode)[8];
     H264PredContext hpc;
@@ -806,6 +809,16 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb
                && (top_xy    < s->mb_stride || ((qp + s->current_picture.qscale_table[top_xy    -s->mb_stride] + 1)>>1) <= qp_thresh))
                 return 1;
         }
+
+        if(h->deblocking_filter == 2){
+            h->top_type    = top_type     = h->slice_table[top_xy     ] == h->slice_num ? s->current_picture.mb_type[top_xy]     : 0;
+            h->left_type[0]= left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0;
+            h->left_type[1]= left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0;
+        }else{
+            h->top_type    = top_type     = h->slice_table[top_xy     ] < 0xFFFF ? s->current_picture.mb_type[top_xy]     : 0;
+            h->left_type[0]= left_type[0] = h->slice_table[left_xy[0] ] < 0xFFFF ? s->current_picture.mb_type[left_xy[0]] : 0;
+            h->left_type[1]= left_type[1] = h->slice_table[left_xy[1] ] < 0xFFFF ? s->current_picture.mb_type[left_xy[1]] : 0;
+        }
         if(IS_INTRA(mb_type))
             return 0;
 
@@ -817,10 +830,6 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb
 
         h->cbp= h->cbp_table[mb_xy];
 
-        top_type     = h->slice_table[top_xy     ] < 0xFFFF ? s->current_picture.mb_type[top_xy]     : 0;
-        left_type[0] = h->slice_table[left_xy[0] ] < 0xFFFF ? s->current_picture.mb_type[left_xy[0]] : 0;
-        left_type[1] = h->slice_table[left_xy[1] ] < 0xFFFF ? s->current_picture.mb_type[left_xy[1]] : 0;
-
         {
             int list;
             for(list=0; list<h->list_count; list++){

-- 
Libav/FFmpeg packaging