diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-29 18:53:57 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-05-02 12:18:44 +0200 |
| commit | 975a1447f76e8d30fc01e6ea5466c84faf3d76e4 (patch) | |
| tree | d462ee5cc7a2f59c44f797c97fc237c999c94e55 /libavcodec/dxva2_vc1.c | |
| parent | 6209669de4a0aa056ae05b0a2c78eaf2ca489b23 (diff) | |
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec/dxva2_vc1.c')
| -rw-r--r-- | libavcodec/dxva2_vc1.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index 8bc84a8f68..112d7df785 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -42,11 +42,11 @@ static void fill_picture_parameters(AVCodecContext *avctx, memset(pp, 0, sizeof(*pp)); pp->wDecodedPictureIndex = pp->wDeblockedPictureIndex = ff_dxva2_get_surface_index(ctx, current_picture); - if (s->pict_type != FF_I_TYPE) + if (s->pict_type != AV_PICTURE_TYPE_I) pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(ctx, &s->last_picture); else pp->wForwardRefPictureIndex = 0xffff; - if (s->pict_type == FF_B_TYPE) + if (s->pict_type == AV_PICTURE_TYPE_B) pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(ctx, &s->next_picture); else pp->wBackwardRefPictureIndex = 0xffff; @@ -69,8 +69,8 @@ static void fill_picture_parameters(AVCodecContext *avctx, if (s->picture_structure & PICT_BOTTOM_FIELD) pp->bPicStructure |= 0x02; pp->bSecondField = v->interlace && v->fcm != 0x03 && !s->first_field; - pp->bPicIntra = s->pict_type == FF_I_TYPE; - pp->bPicBackwardPrediction = s->pict_type == FF_B_TYPE; + pp->bPicIntra = s->pict_type == AV_PICTURE_TYPE_I; + pp->bPicBackwardPrediction = s->pict_type == AV_PICTURE_TYPE_B; pp->bBidirectionalAveragingMode = (1 << 7) | ((ctx->cfg->ConfigIntraResidUnsigned != 0) << 6) | ((ctx->cfg->ConfigResidDiffAccelerator != 0) << 5) | @@ -108,10 +108,10 @@ static void fill_picture_parameters(AVCodecContext *avctx, (v->interlace << 5) | (v->tfcntrflag << 4) | (v->finterpflag << 3) | - ((s->pict_type != FF_B_TYPE) << 2) | + ((s->pict_type != AV_PICTURE_TYPE_B) << 2) | (v->psf << 1) | (v->extended_dmv ); - if (s->pict_type != FF_I_TYPE) + if (s->pict_type != AV_PICTURE_TYPE_I) pp->bPic4MVallowed = v->mv_mode == MV_PMODE_MIXED_MV || (v->mv_mode == MV_PMODE_INTENSITY_COMP && v->mv_mode2 == MV_PMODE_MIXED_MV); |