aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-02-13 13:14:07 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-02-13 13:14:07 +0000
commit752cc0dcb2b47f9fcd7efc73d3f7bcd1a53f3c8e (patch)
tree7e7942801a60c8c64bff5103980fa9b863a4ec1a
parent923bcb404804dae142e878cf05115dfbf2d35cd7 (diff)
downloadffmpeg-752cc0dcb2b47f9fcd7efc73d3f7bcd1a53f3c8e.tar.gz
Init sub_mb_type cleanly.
Originally committed as revision 21790 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264_direct.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index bcdb542f4b..0c08e1de63 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++){