[SCM] libav/experimental: Init sub_mb_type cleanly.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 752cc0dcb2b47f9fcd7efc73d3f7bcd1a53f3c8e
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Feb 13 13:14:07 2010 +0000

    Init sub_mb_type cleanly.
    
    Originally committed as revision 21790 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index bcdb542..0c08e1d 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -149,7 +149,7 @@ static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
     const int16_t (*l1mv0)[2], (*l1mv1)[2];
     const int8_t *l1ref0, *l1ref1;
     const int is_b8x8 = IS_8X8(*mb_type);
-    unsigned int sub_mb_type;
+    unsigned int sub_mb_type= MB_TYPE_L0L1;;
     int i8, i4;
     int ref[2];
     int mv[2];
@@ -160,7 +160,6 @@ static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM)
 
     *mb_type |= MB_TYPE_L0L1;
-    sub_mb_type |= MB_TYPE_L0L1;
 
     /* ref = min(neighbors) */
     for(list=0; list<2; list++){

-- 
Libav/FFmpeg packaging