Revision ce5e49b0 libavcodec/rv10.c

View differences:

libavcodec/rv10.c
240 240
    marker = get_bits1(&s->gb);
241 241

  
242 242
    if (get_bits1(&s->gb))
243
        s->pict_type = FF_P_TYPE;
243
        s->pict_type = AV_PICTURE_TYPE_P;
244 244
    else
245
        s->pict_type = FF_I_TYPE;
245
        s->pict_type = AV_PICTURE_TYPE_I;
246 246
    if(!marker) av_log(s->avctx, AV_LOG_ERROR, "marker missing\n");
247 247
    pb_frame = get_bits1(&s->gb);
248 248

  
......
259 259
        return -1;
260 260
    }
261 261

  
262
    if (s->pict_type == FF_I_TYPE) {
262
    if (s->pict_type == AV_PICTURE_TYPE_I) {
263 263
        if (s->rv10_version == 3) {
264 264
            /* specific MPEG like DC coding not used */
265 265
            s->last_dc[0] = get_bits(&s->gb, 8);
......
319 319

  
320 320
    i= get_bits(&s->gb, 2);
321 321
    switch(i){
322
    case 0: s->pict_type= FF_I_TYPE; break;
323
    case 1: s->pict_type= FF_I_TYPE; break; //hmm ...
324
    case 2: s->pict_type= FF_P_TYPE; break;
325
    case 3: s->pict_type= FF_B_TYPE; break;
322
    case 0: s->pict_type= AV_PICTURE_TYPE_I; break;
323
    case 1: s->pict_type= AV_PICTURE_TYPE_I; break; //hmm ...
324
    case 2: s->pict_type= AV_PICTURE_TYPE_P; break;
325
    case 3: s->pict_type= AV_PICTURE_TYPE_B; break;
326 326
    default:
327 327
        av_log(s->avctx, AV_LOG_ERROR, "unknown frame type\n");
328 328
        return -1;
329 329
    }
330 330

  
331
    if(s->last_picture_ptr==NULL && s->pict_type==FF_B_TYPE){
331
    if(s->last_picture_ptr==NULL && s->pict_type==AV_PICTURE_TYPE_B){
332 332
        av_log(s->avctx, AV_LOG_ERROR, "early B pix\n");
333 333
        return -1;
334 334
    }
......
399 399
    if(seq - s->time >  0x4000) seq -= 0x8000;
400 400
    if(seq - s->time < -0x4000) seq += 0x8000;
401 401
    if(seq != s->time){
402
        if(s->pict_type!=FF_B_TYPE){
402
        if(s->pict_type!=AV_PICTURE_TYPE_B){
403 403
            s->time= seq;
404 404
            s->pp_time= s->time - s->last_non_b_time;
405 405
            s->last_non_b_time= s->time;
......
422 422

  
423 423
    s->f_code = 1;
424 424
    s->unrestricted_mv = 1;
425
    s->h263_aic= s->pict_type == FF_I_TYPE;
425
    s->h263_aic= s->pict_type == AV_PICTURE_TYPE_I;
426 426
//    s->alt_inter_vlc=1;
427 427
//    s->obmc=1;
428 428
//    s->umvplus=1;
......
435 435
                   seq, s->mb_x, s->mb_y, s->pict_type, s->qscale, s->no_rounding);
436 436
    }
437 437

  
438
    assert(s->pict_type != FF_B_TYPE || !s->low_delay);
438
    assert(s->pict_type != AV_PICTURE_TYPE_B || !s->low_delay);
439 439

  
440 440
    return s->mb_width*s->mb_height - mb_pos;
441 441
}
......
616 616
            av_log(s->avctx, AV_LOG_ERROR, "ERROR at MB %d %d\n", s->mb_x, s->mb_y);
617 617
            return -1;
618 618
        }
619
        if(s->pict_type != FF_B_TYPE)
619
        if(s->pict_type != AV_PICTURE_TYPE_B)
620 620
            ff_h263_update_motion_val(s);
621 621
        MPV_decode_mb(s, s->block);
622 622
        if(s->loop_filter)
......
693 693
        ff_er_frame_end(s);
694 694
        MPV_frame_end(s);
695 695

  
696
        if (s->pict_type == FF_B_TYPE || s->low_delay) {
696
        if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
697 697
            *pict= *(AVFrame*)s->current_picture_ptr;
698 698
        } else if (s->last_picture_ptr != NULL) {
699 699
            *pict= *(AVFrame*)s->last_picture_ptr;

Also available in: Unified diff