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/vaapi_mpeg4.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/vaapi_mpeg4.c')
| -rw-r--r-- | libavcodec/vaapi_mpeg4.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index 1b3817a14b..fcd429086e 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -78,8 +78,8 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ } pic_param->quant_precision = s->quant_precision; pic_param->vop_fields.value = 0; /* reset all bits */ - pic_param->vop_fields.bits.vop_coding_type = s->pict_type - FF_I_TYPE; - pic_param->vop_fields.bits.backward_reference_vop_coding_type = s->pict_type == FF_B_TYPE ? s->next_picture.pict_type - FF_I_TYPE : 0; + pic_param->vop_fields.bits.vop_coding_type = s->pict_type - AV_PICTURE_TYPE_I; + pic_param->vop_fields.bits.backward_reference_vop_coding_type = s->pict_type == AV_PICTURE_TYPE_B ? s->next_picture.pict_type - AV_PICTURE_TYPE_I : 0; pic_param->vop_fields.bits.vop_rounding_type = s->no_rounding; pic_param->vop_fields.bits.intra_dc_vlc_thr = mpeg4_get_intra_dc_vlc_thr(s); pic_param->vop_fields.bits.top_field_first = s->top_field_first; @@ -92,9 +92,9 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ pic_param->TRB = s->pb_time; pic_param->TRD = s->pp_time; - if (s->pict_type == FF_B_TYPE) + if (s->pict_type == AV_PICTURE_TYPE_B) pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture); - if (s->pict_type != FF_I_TYPE) + if (s->pict_type != AV_PICTURE_TYPE_I) pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture); /* Fill in VAIQMatrixBufferMPEG4 */ |