Revision b7ec19d3

View differences:

libavcodec/h263dec.c
79 79
{
80 80
    MpegEncContext *s = avctx->priv_data;
81 81
    int ret;
82
    DCTELEM block[6][64];
83 82
    AVPicture *pict = data; 
84 83

  
85 84
#ifdef DEBUG
......
131 130
                s->c_dc_scale = 8;
132 131
            }
133 132

  
134
            memset(block, 0, sizeof(block));
133
            memset(s->block, 0, sizeof(s->block));
135 134
            s->mv_dir = MV_DIR_FORWARD;
136 135
            s->mv_type = MV_TYPE_16X16; 
137 136
            if (s->h263_msmpeg4) {
138
                if (msmpeg4_decode_mb(s, block) < 0)
137
                if (msmpeg4_decode_mb(s, s->block) < 0)
139 138
                    return -1;
140 139
            } else {
141
                if (h263_decode_mb(s, block) < 0)
140
                if (h263_decode_mb(s, s->block) < 0)
142 141
                    return -1;
143 142
            }
144
            MPV_decode_mb(s, block);
143
            MPV_decode_mb(s, s->block);
145 144
        }
146 145
    }
147 146

  
libavcodec/mpeg12.c
1260 1260
    Mpeg1Context *s1 = avctx->priv_data;
1261 1261
    MpegEncContext *s = &s1->mpeg_enc_ctx;
1262 1262
    int ret;
1263
    DCTELEM block[6][64];
1264 1263

  
1265 1264
    start_code = (start_code - 1) & 0xff;
1266 1265
    if (start_code >= s->mb_height)
......
1288 1287
    }
1289 1288

  
1290 1289
    for(;;) {
1291
        memset(block, 0, sizeof(block));
1292
        ret = mpeg_decode_mb(s, block);
1290
        memset(s->block, 0, sizeof(s->block));
1291
        ret = mpeg_decode_mb(s, s->block);
1293 1292
        dprintf("ret=%d\n", ret);
1294 1293
        if (ret < 0)
1295 1294
            return -1;
1296 1295
        if (ret == 1)
1297 1296
            break;
1298
        MPV_decode_mb(s, block);
1297
        MPV_decode_mb(s, s->block);
1299 1298
    }
1300 1299
    
1301 1300
    /* end of slice reached */

Also available in: Unified diff