X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Flibxvid.c;h=7b25c628b219e971abd5e3ef27c9fec470c871d3;hb=40cf1bbacc6220a0aa6bed5c331871d43f9ce370;hp=b440ac2d9267af1ce04fe4eeab66d57ac3535f1e;hpb=5d3addb937946eca5391e40b5e6308e74ac6f77b;p=ffmpeg diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index b440ac2d926..7b25c628b21 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -751,6 +751,8 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt, *got_packet = 1; +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS avctx->coded_frame->quality = xvid_enc_stats.quant * FF_QP2LAMBDA; if (xvid_enc_stats.type == XVID_TYPE_PVOP) avctx->coded_frame->pict_type = AV_PICTURE_TYPE_P; @@ -760,14 +762,24 @@ static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt, avctx->coded_frame->pict_type = AV_PICTURE_TYPE_S; else avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; +FF_ENABLE_DEPRECATION_WARNINGS +#endif if (xvid_enc_frame.out_flags & XVID_KEYFRAME) { +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS avctx->coded_frame->key_frame = 1; +FF_ENABLE_DEPRECATION_WARNINGS +#endif pkt->flags |= AV_PKT_FLAG_KEY; if (x->quicktime_format) return xvid_strip_vol_header(avctx, pkt, xvid_enc_stats.hlength, xerr); } else { +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS avctx->coded_frame->key_frame = 0; +FF_ENABLE_DEPRECATION_WARNINGS +#endif } pkt->size = xerr;