Revision 174489bd libavcodec/mpegvideo.c

View differences:

libavcodec/mpegvideo.c
174 174
        }
175 175
    }
176 176
    
177
    if (s->out_format == FMT_H263) {
177
    if (s->out_format == FMT_H263 || s->encoding) {
178 178
        int size;
179 179
        /* MV prediction */
180 180
        size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2);
......
295 295
    s->qblur= avctx->qblur;
296 296
    s->avctx = avctx;
297 297
    s->aspect_ratio_info= avctx->aspect_ratio_info;
298
    s->hq= (avctx->flags & CODEC_FLAG_HQ);
298 299
    
299 300
    if (s->gop_size <= 1) {
300 301
        s->intra_only = 1;
......
506 507

  
507 508
    if (!s->intra_only) {
508 509
        /* first picture of GOP is intra */
509
        if (s->picture_in_gop_number >= s->gop_size){
510
        if (s->picture_in_gop_number % s->gop_size==0){
510 511
            s->picture_in_gop_number=0;
511 512
            s->pict_type = I_TYPE;
512 513
        }else
......
1097 1098
    for(mb_y=0; mb_y < s->mb_height; mb_y++) {
1098 1099
        for(mb_x=0; mb_x < s->mb_width; mb_x++) {
1099 1100
            int xy= mb_y * s->mb_width + mb_x;
1101
            const int mot_stride = s->mb_width*2 + 2;
1102
            int mot_xy = (mb_y*2 + 1)*mot_stride + mb_x*2 + 1;
1100 1103
            s->mb_x = mb_x;
1101 1104
            s->mb_y = mb_y;
1102 1105

  
......
1114 1117
            s->mb_type[xy] = s->mb_intra;
1115 1118
            s->mv_table[0][xy] = motion_x;
1116 1119
            s->mv_table[1][xy] = motion_y;
1120

  
1121
            s->motion_val[mot_xy  ][0]= motion_x;
1122
            s->motion_val[mot_xy  ][1]= motion_y;
1123
            s->motion_val[mot_xy+1][0]= motion_x;
1124
            s->motion_val[mot_xy+1][1]= motion_y;
1125
            mot_xy += mot_stride;
1126
            s->motion_val[mot_xy  ][0]= motion_x;
1127
            s->motion_val[mot_xy  ][1]= motion_y;
1128
            s->motion_val[mot_xy+1][0]= motion_x;
1129
            s->motion_val[mot_xy+1][1]= motion_y;
1117 1130
        }
1118 1131
    }
1119 1132
    emms_c();

Also available in: Unified diff