diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-05-13 08:17:25 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-05-13 08:17:25 +0000 |
| commit | d2cc7468f354831aa7444b2a1ebac61a25f3645c (patch) | |
| tree | e12366a13bad1b1fa38242991203231d6aff3d1a /libavcodec | |
| parent | 5cb46bc722a7691209fcd10f6c2e9d5035989b89 (diff) | |
| download | ffmpeg-d2cc7468f354831aa7444b2a1ebac61a25f3645c.tar.gz | |
10l (mb_type uninitalized and then changed and overwritten)
Originally committed as revision 4232 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 436be57a59..5ab3c428ec 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4191,7 +4191,7 @@ static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, in static void decode_mb_skip(H264Context *h){ MpegEncContext * const s = &h->s; const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; - int mb_type; + int mb_type=0; memset(h->non_zero_count[mb_xy], 0, 16); memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui @@ -4201,11 +4201,11 @@ static void decode_mb_skip(H264Context *h){ } if(h->mb_field_decoding_flag) mb_type|= MB_TYPE_INTERLACED; - + if( h->slice_type == B_TYPE ) { // just for fill_caches. pred_direct_motion will set the real mb_type - mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; + mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... pred_direct_motion(h, &mb_type); @@ -4217,7 +4217,7 @@ static void decode_mb_skip(H264Context *h){ else { int mx, my; - mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; + mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... pred_pskip_motion(h, &mx, &my); |