mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-24 17:32:22 +08:00
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
committed by
Diego Biurrun
parent
6209669de4
commit
975a1447f7
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user