X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavcodec%2Flibxavs.c;h=b0b6b247b6fe98a78e809f7080927dd959e39105;hb=11bc79089378a5ec00547d0f85bc152afdf30dfa;hp=0f22016731a945c054d4b08ec7d9e984dc829a8b;hpb=d85c41b5723a4acf9400043cb533682d2e2c4287;p=ffmpeg diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index 0f22016731a..b0b6b247b6f 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -165,11 +165,6 @@ static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt, return 0; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pts = pic_out.i_pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->pts = pic_out.i_pts; if (avctx->has_b_frames) { if (!x4->out_frame_count) @@ -194,29 +189,13 @@ FF_ENABLE_DEPRECATION_WARNINGS default: pict_type = AV_PICTURE_TYPE_NONE; } -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = pict_type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* There is no IDR frame in AVS JiZhun */ /* Sequence header is used as a flag */ if (pic_out.i_type == XAVS_TYPE_I) { -#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 FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->quality = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - ff_side_data_set_encoder_stats(pkt, (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA, NULL, 0, pict_type); x4->out_frame_count++;