Revision ce5e49b0 libavcodec/libxvidff.c

View differences:

libavcodec/libxvidff.c
450 450
    xvid_enc_frame.vol_flags = x->vol_flags;
451 451
    xvid_enc_frame.motion = x->me_flags;
452 452
    xvid_enc_frame.type =
453
        picture->pict_type == FF_I_TYPE ? XVID_TYPE_IVOP :
454
        picture->pict_type == FF_P_TYPE ? XVID_TYPE_PVOP :
455
        picture->pict_type == FF_B_TYPE ? XVID_TYPE_BVOP :
453
        picture->pict_type == AV_PICTURE_TYPE_I ? XVID_TYPE_IVOP :
454
        picture->pict_type == AV_PICTURE_TYPE_P ? XVID_TYPE_PVOP :
455
        picture->pict_type == AV_PICTURE_TYPE_B ? XVID_TYPE_BVOP :
456 456
                                          XVID_TYPE_AUTO;
457 457

  
458 458
    /* Pixel aspect ratio setting */
......
493 493
    if( 0 <= xerr ) {
494 494
        p->quality = xvid_enc_stats.quant * FF_QP2LAMBDA;
495 495
        if( xvid_enc_stats.type == XVID_TYPE_PVOP )
496
            p->pict_type = FF_P_TYPE;
496
            p->pict_type = AV_PICTURE_TYPE_P;
497 497
        else if( xvid_enc_stats.type == XVID_TYPE_BVOP )
498
            p->pict_type = FF_B_TYPE;
498
            p->pict_type = AV_PICTURE_TYPE_B;
499 499
        else if( xvid_enc_stats.type == XVID_TYPE_SVOP )
500
            p->pict_type = FF_S_TYPE;
500
            p->pict_type = AV_PICTURE_TYPE_S;
501 501
        else
502
            p->pict_type = FF_I_TYPE;
502
            p->pict_type = AV_PICTURE_TYPE_I;
503 503
        if( xvid_enc_frame.out_flags & XVID_KEYFRAME ) {
504 504
            p->key_frame = 1;
505 505
            if( x->quicktime_format )

Also available in: Unified diff