Revision ce5e49b0 libavcodec/ituh263enc.c

View differences:

libavcodec/ituh263enc.c
145 145
    if (!s->h263_plus) {
146 146
        /* H.263v1 */
147 147
        put_bits(&s->pb, 3, format);
148
        put_bits(&s->pb, 1, (s->pict_type == FF_P_TYPE));
148
        put_bits(&s->pb, 1, (s->pict_type == AV_PICTURE_TYPE_P));
149 149
        /* By now UMV IS DISABLED ON H.263v1, since the restrictions
150 150
        of H.263v1 UMV implies to check the predicted MV after
151 151
        calculation of the current MB to see if we're on the limits */
......
181 181
        put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */
182 182
        put_bits(&s->pb,3,0); /* Reserved */
183 183

  
184
        put_bits(&s->pb, 3, s->pict_type == FF_P_TYPE);
184
        put_bits(&s->pb, 3, s->pict_type == AV_PICTURE_TYPE_P);
185 185

  
186 186
        put_bits(&s->pb,1,0); /* Reference Picture Resampling: off */
187 187
        put_bits(&s->pb,1,0); /* Reduced-Resolution Update: off */
......
260 260
            put_bits(&s->pb, 1, 1);
261 261
        put_bits(&s->pb, 5, s->qscale); /* GQUANT */
262 262
        put_bits(&s->pb, 1, 1);
263
        put_bits(&s->pb, 2, s->pict_type == FF_I_TYPE); /* GFID */
263
        put_bits(&s->pb, 2, s->pict_type == AV_PICTURE_TYPE_I); /* GFID */
264 264
    }else{
265 265
        int gob_number= mb_line / s->gob_index;
266 266

  
267 267
        put_bits(&s->pb, 5, gob_number); /* GN */
268
        put_bits(&s->pb, 2, s->pict_type == FF_I_TYPE); /* GFID */
268
        put_bits(&s->pb, 2, s->pict_type == AV_PICTURE_TYPE_I); /* GFID */
269 269
        put_bits(&s->pb, 5, s->qscale); /* GQUANT */
270 270
    }
271 271
}
......
607 607
        }
608 608

  
609 609
        cbpc = cbp & 3;
610
        if (s->pict_type == FF_I_TYPE) {
610
        if (s->pict_type == AV_PICTURE_TYPE_I) {
611 611
            if(s->dquant) cbpc+=4;
612 612
            put_bits(&s->pb,
613 613
                ff_h263_intra_MCBPC_bits[cbpc],

Also available in: Unified diff