Revision ce5e49b0 libavcodec/dxva2_vc1.c

View differences:

libavcodec/dxva2_vc1.c
42 42
    memset(pp, 0, sizeof(*pp));
43 43
    pp->wDecodedPictureIndex    =
44 44
    pp->wDeblockedPictureIndex  = ff_dxva2_get_surface_index(ctx, current_picture);
45
    if (s->pict_type != FF_I_TYPE)
45
    if (s->pict_type != AV_PICTURE_TYPE_I)
46 46
        pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(ctx, &s->last_picture);
47 47
    else
48 48
        pp->wForwardRefPictureIndex = 0xffff;
49
    if (s->pict_type == FF_B_TYPE)
49
    if (s->pict_type == AV_PICTURE_TYPE_B)
50 50
        pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(ctx, &s->next_picture);
51 51
    else
52 52
        pp->wBackwardRefPictureIndex = 0xffff;
......
69 69
    if (s->picture_structure & PICT_BOTTOM_FIELD)
70 70
        pp->bPicStructure      |= 0x02;
71 71
    pp->bSecondField            = v->interlace && v->fcm != 0x03 && !s->first_field;
72
    pp->bPicIntra               = s->pict_type == FF_I_TYPE;
73
    pp->bPicBackwardPrediction  = s->pict_type == FF_B_TYPE;
72
    pp->bPicIntra               = s->pict_type == AV_PICTURE_TYPE_I;
73
    pp->bPicBackwardPrediction  = s->pict_type == AV_PICTURE_TYPE_B;
74 74
    pp->bBidirectionalAveragingMode = (1                                           << 7) |
75 75
                                      ((ctx->cfg->ConfigIntraResidUnsigned != 0)   << 6) |
76 76
                                      ((ctx->cfg->ConfigResidDiffAccelerator != 0) << 5) |
......
108 108
                                  (v->interlace                << 5) |
109 109
                                  (v->tfcntrflag               << 4) |
110 110
                                  (v->finterpflag              << 3) |
111
                                  ((s->pict_type != FF_B_TYPE) << 2) |
111
                                  ((s->pict_type != AV_PICTURE_TYPE_B) << 2) |
112 112
                                  (v->psf                      << 1) |
113 113
                                  (v->extended_dmv                 );
114
    if (s->pict_type != FF_I_TYPE)
114
    if (s->pict_type != AV_PICTURE_TYPE_I)
115 115
        pp->bPic4MVallowed      = v->mv_mode == MV_PMODE_MIXED_MV ||
116 116
                                  (v->mv_mode == MV_PMODE_INTENSITY_COMP &&
117 117
                                   v->mv_mode2 == MV_PMODE_MIXED_MV);

Also available in: Unified diff