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_mpeg2.c | |
| parent | 6209669de4a0aa056ae05b0a2c78eaf2ca489b23 (diff) | |
| download | ffmpeg-975a1447f76e8d30fc01e6ea5466c84faf3d76e4.tar.gz | |
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec/dxva2_mpeg2.c')
| -rw-r--r-- | libavcodec/dxva2_mpeg2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c index 6868e39899..f14aabd540 100644 --- a/libavcodec/dxva2_mpeg2.c +++ b/libavcodec/dxva2_mpeg2.c @@ -44,11 +44,11 @@ static void fill_picture_parameters(AVCodecContext *avctx, memset(pp, 0, sizeof(*pp)); pp->wDecodedPictureIndex = ff_dxva2_get_surface_index(ctx, current_picture); pp->wDeblockedPictureIndex = 0; - 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; @@ -61,8 +61,8 @@ static void fill_picture_parameters(AVCodecContext *avctx, pp->bBPPminus1 = 7; pp->bPicStructure = s->picture_structure; pp->bSecondField = is_field && !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 = 0; pp->bMVprecisionAndChromaRelation= 0; /* FIXME */ pp->bChromaFormat = s->chroma_format; |