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/vaapi_vc1.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'libavcodec/vaapi_vc1.c') diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index 8effa7ecd2..19865dc0e8 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -42,7 +42,7 @@ static inline int vc1_has_MVTYPEMB_bitplane(VC1Context *v) { if (v->mv_type_is_raw) return 0; - return (v->s.pict_type == FF_P_TYPE && + return (v->s.pict_type == AV_PICTURE_TYPE_P && (v->mv_mode == MV_PMODE_MIXED_MV || (v->mv_mode == MV_PMODE_INTENSITY_COMP && v->mv_mode2 == MV_PMODE_MIXED_MV))); @@ -53,8 +53,8 @@ static inline int vc1_has_SKIPMB_bitplane(VC1Context *v) { if (v->skip_is_raw) return 0; - return (v->s.pict_type == FF_P_TYPE || - (v->s.pict_type == FF_B_TYPE && !v->bi_type)); + return (v->s.pict_type == AV_PICTURE_TYPE_P || + (v->s.pict_type == AV_PICTURE_TYPE_B && !v->bi_type)); } /** Check whether the DIRECTMB bitplane is present */ @@ -62,7 +62,7 @@ static inline int vc1_has_DIRECTMB_bitplane(VC1Context *v) { if (v->dmb_is_raw) return 0; - return v->s.pict_type == FF_B_TYPE && !v->bi_type; + return v->s.pict_type == AV_PICTURE_TYPE_B && !v->bi_type; } /** Check whether the ACPRED bitplane is present */ @@ -71,8 +71,8 @@ static inline int vc1_has_ACPRED_bitplane(VC1Context *v) if (v->acpred_is_raw) return 0; return (v->profile == PROFILE_ADVANCED && - (v->s.pict_type == FF_I_TYPE || - (v->s.pict_type == FF_B_TYPE && v->bi_type))); + (v->s.pict_type == AV_PICTURE_TYPE_I || + (v->s.pict_type == AV_PICTURE_TYPE_B && v->bi_type))); } /** Check whether the OVERFLAGS bitplane is present */ @@ -81,8 +81,8 @@ static inline int vc1_has_OVERFLAGS_bitplane(VC1Context *v) if (v->overflg_is_raw) return 0; return (v->profile == PROFILE_ADVANCED && - (v->s.pict_type == FF_I_TYPE || - (v->s.pict_type == FF_B_TYPE && v->bi_type)) && + (v->s.pict_type == AV_PICTURE_TYPE_I || + (v->s.pict_type == AV_PICTURE_TYPE_B && v->bi_type)) && (v->overlap && v->pq <= 8) && v->condover == CONDOVER_SELECT); } @@ -92,9 +92,9 @@ static int vc1_get_PTYPE(VC1Context *v) { MpegEncContext * const s = &v->s; switch (s->pict_type) { - case FF_I_TYPE: return 0; - case FF_P_TYPE: return v->p_frame_skipped ? 4 : 1; - case FF_B_TYPE: return v->bi_type ? 3 : 2; + case AV_PICTURE_TYPE_I: return 0; + case AV_PICTURE_TYPE_P: return v->p_frame_skipped ? 4 : 1; + case AV_PICTURE_TYPE_B: return v->bi_type ? 3 : 2; } return 0; } @@ -102,8 +102,8 @@ static int vc1_get_PTYPE(VC1Context *v) /** Reconstruct bitstream MVMODE (7.1.1.32) */ static inline VAMvModeVC1 vc1_get_MVMODE(VC1Context *v) { - if (v->s.pict_type == FF_P_TYPE || - (v->s.pict_type == FF_B_TYPE && !v->bi_type)) + if (v->s.pict_type == AV_PICTURE_TYPE_P || + (v->s.pict_type == AV_PICTURE_TYPE_B && !v->bi_type)) return get_VAMvModeVC1(v->mv_mode); return 0; } @@ -111,7 +111,7 @@ static inline VAMvModeVC1 vc1_get_MVMODE(VC1Context *v) /** Reconstruct bitstream MVMODE2 (7.1.1.33) */ static inline VAMvModeVC1 vc1_get_MVMODE2(VC1Context *v) { - if (v->s.pict_type == FF_P_TYPE && v->mv_mode == MV_PMODE_INTENSITY_COMP) + if (v->s.pict_type == AV_PICTURE_TYPE_P && v->mv_mode == MV_PMODE_INTENSITY_COMP) return get_VAMvModeVC1(v->mv_mode2); return 0; } @@ -245,10 +245,10 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t pic_param->transform_fields.bits.intra_transform_dc_table = v->s.dc_table_index; switch (s->pict_type) { - case FF_B_TYPE: + case AV_PICTURE_TYPE_B: pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture); // fall-through - case FF_P_TYPE: + case AV_PICTURE_TYPE_P: pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture); break; } @@ -259,12 +259,12 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t int x, y, n; switch (s->pict_type) { - case FF_P_TYPE: + case AV_PICTURE_TYPE_P: ff_bp[0] = pic_param->bitplane_present.flags.bp_direct_mb ? v->direct_mb_plane : NULL; ff_bp[1] = pic_param->bitplane_present.flags.bp_skip_mb ? s->mbskip_table : NULL; ff_bp[2] = pic_param->bitplane_present.flags.bp_mv_type_mb ? v->mv_type_mb_plane : NULL; break; - case FF_B_TYPE: + case AV_PICTURE_TYPE_B: if (!v->bi_type) { ff_bp[0] = pic_param->bitplane_present.flags.bp_direct_mb ? v->direct_mb_plane : NULL; ff_bp[1] = pic_param->bitplane_present.flags.bp_skip_mb ? s->mbskip_table : NULL; @@ -272,7 +272,7 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t break; } /* fall-through (BI-type) */ - case FF_I_TYPE: + case AV_PICTURE_TYPE_I: ff_bp[0] = NULL; /* XXX: interlaced frame (FIELDTX plane) */ ff_bp[1] = pic_param->bitplane_present.flags.bp_ac_pred ? v->acpred_plane : NULL; ff_bp[2] = pic_param->bitplane_present.flags.bp_overflags ? v->over_flags_plane : NULL; -- cgit v1.2.3