From 975a1447f76e8d30fc01e6ea5466c84faf3d76e4 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Fri, 29 Apr 2011 18:53:57 +0200 Subject: Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. Signed-off-by: Diego Biurrun --- libavcodec/dxva2_h264.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/dxva2_h264.c') diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index d99bb0a1f7..8de4c51082 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -246,7 +246,7 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, slice->slice_qs_delta = 0; /* XXX not implemented by Libav */ slice->slice_qp_delta = s->qscale - h->pps.init_qp; slice->redundant_pic_cnt = h->redundant_pic_count; - if (h->slice_type == FF_B_TYPE) + if (h->slice_type == AV_PICTURE_TYPE_B) slice->direct_spatial_mv_pred_flag = h->direct_spatial_mv_pred; slice->cabac_init_idc = h->pps.cabac ? h->cabac_init_idc : 0; if (h->deblocking_filter < 2) @@ -403,7 +403,7 @@ static int decode_slice(AVCodecContext *avctx, position, size); ctx_pic->slice_count++; - if (h->slice_type != FF_I_TYPE && h->slice_type != FF_SI_TYPE) + if (h->slice_type != AV_PICTURE_TYPE_I && h->slice_type != AV_PICTURE_TYPE_SI) ctx_pic->pp.wBitFields &= ~(1 << 15); /* Set IntraPicFlag to 0 */ return 0; } -- cgit v1.2.3