Revision ce5e49b0 libavcodec/vaapi_mpeg4.c

View differences:

libavcodec/vaapi_mpeg4.c
78 78
    }
79 79
    pic_param->quant_precision                          = s->quant_precision;
80 80
    pic_param->vop_fields.value                         = 0; /* reset all bits */
81
    pic_param->vop_fields.bits.vop_coding_type          = s->pict_type - FF_I_TYPE;
82
    pic_param->vop_fields.bits.backward_reference_vop_coding_type = s->pict_type == FF_B_TYPE ? s->next_picture.pict_type - FF_I_TYPE : 0;
81
    pic_param->vop_fields.bits.vop_coding_type          = s->pict_type - AV_PICTURE_TYPE_I;
82
    pic_param->vop_fields.bits.backward_reference_vop_coding_type = s->pict_type == AV_PICTURE_TYPE_B ? s->next_picture.pict_type - AV_PICTURE_TYPE_I : 0;
83 83
    pic_param->vop_fields.bits.vop_rounding_type        = s->no_rounding;
84 84
    pic_param->vop_fields.bits.intra_dc_vlc_thr         = mpeg4_get_intra_dc_vlc_thr(s);
85 85
    pic_param->vop_fields.bits.top_field_first          = s->top_field_first;
......
92 92
    pic_param->TRB                                      = s->pb_time;
93 93
    pic_param->TRD                                      = s->pp_time;
94 94

  
95
    if (s->pict_type == FF_B_TYPE)
95
    if (s->pict_type == AV_PICTURE_TYPE_B)
96 96
        pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture);
97
    if (s->pict_type != FF_I_TYPE)
97
    if (s->pict_type != AV_PICTURE_TYPE_I)
98 98
        pic_param->forward_reference_picture  = ff_vaapi_get_surface_id(&s->last_picture);
99 99

  
100 100
    /* Fill in VAIQMatrixBufferMPEG4 */

Also available in: Unified diff