diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-14 03:36:13 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:12 -0300 |
| commit | 11bc79089378a5ec00547d0f85bc152afdf30dfa (patch) | |
| tree | 05f5a97cfe141b7a2f5bab4b26205fe014d6ec3e /libavcodec/libvpxenc.c | |
| parent | 95054bfa48cc71db1c7bf66a6b6628cb62f262bf (diff) | |
| download | ffmpeg-11bc79089378a5ec00547d0f85bc152afdf30dfa.tar.gz | |
avcodec: Remove deprecated AVCodecContext.coded_frame
Deprecated in 40cf1bbacc6220a0aa6bed5c331871d43f9ce370.
(The currently disabled filter vf_mcdeint and vf_uspp were users of
this field; they have not been changed, so that whoever wants to fix
them can see the state of these filters when they were disabled.)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/libvpxenc.c')
| -rw-r--r-- | libavcodec/libvpxenc.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 76013a74d3..bcfbbf3e76 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1179,28 +1179,12 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, int pict_type; memcpy(pkt->data, cx_frame->buf, pkt->size); pkt->pts = pkt->dts = cx_frame->pts; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pts = cx_frame->pts; - avctx->coded_frame->key_frame = !!(cx_frame->flags & VPX_FRAME_IS_KEY); -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (!!(cx_frame->flags & VPX_FRAME_IS_KEY)) { pict_type = AV_PICTURE_TYPE_I; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = pict_type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->flags |= AV_PKT_FLAG_KEY; } else { pict_type = AV_PICTURE_TYPE_P; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->pict_type = pict_type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } ff_side_data_set_encoder_stats(pkt, 0, cx_frame->sse + 1, @@ -1209,14 +1193,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (cx_frame->have_sse) { int i; /* Beware of the Y/U/V/all order! */ -#if FF_API_CODED_FRAME && FF_API_ERROR_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - avctx->coded_frame->error[0] = cx_frame->sse[1]; - avctx->coded_frame->error[1] = cx_frame->sse[2]; - avctx->coded_frame->error[2] = cx_frame->sse[3]; - avctx->coded_frame->error[3] = 0; // alpha -FF_ENABLE_DEPRECATION_WARNINGS -#endif for (i = 0; i < 3; ++i) { avctx->error[i] += cx_frame->sse[i + 1]; } |