diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-06 20:40:41 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:13 -0300 |
| commit | 6e30b35b85b81c802e52a1078ec7a3097e353c6d (patch) | |
| tree | ee16d29abe46a5d27abc8e42f051d5d44b98cf9c /libavutil | |
| parent | 3b56fa85e8f50db83b54518ae31ebdb3f6b0cc39 (diff) | |
| download | ffmpeg-6e30b35b85b81c802e52a1078ec7a3097e353c6d.tar.gz | |
avutil/frame: Remove deprecated AVFrame.pkt_pts field
Deprecated in 32c8359093d1ff4f45ed19518b449b3ac3769d27.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.c | 10 | ||||
| -rw-r--r-- | libavutil/frame.h | 9 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 0 insertions, 22 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index d69dd38dc4..e29008752c 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -72,11 +72,6 @@ static void get_frame_defaults(AVFrame *frame) frame->pts = frame->pkt_dts = AV_NOPTS_VALUE; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pts = AV_NOPTS_VALUE; -FF_ENABLE_DEPRECATION_WARNINGS -#endif frame->best_effort_timestamp = AV_NOPTS_VALUE; frame->pkt_duration = 0; frame->pkt_pos = -1; @@ -292,11 +287,6 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) dst->palette_has_changed = src->palette_has_changed; dst->sample_rate = src->sample_rate; dst->opaque = src->opaque; -#if FF_API_PKT_PTS -FF_DISABLE_DEPRECATION_WARNINGS - dst->pkt_pts = src->pkt_pts; -FF_ENABLE_DEPRECATION_WARNINGS -#endif dst->pkt_dts = src->pkt_dts; dst->pkt_pos = src->pkt_pos; dst->pkt_size = src->pkt_size; diff --git a/libavutil/frame.h b/libavutil/frame.h index 23396189d9..43345bcdee 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -399,15 +399,6 @@ typedef struct AVFrame { */ int64_t pts; -#if FF_API_PKT_PTS - /** - * PTS copied from the AVPacket that was decoded to produce this frame. - * @deprecated use the pts field instead - */ - attribute_deprecated - int64_t pkt_pts; -#endif - /** * DTS copied from the AVPacket that triggered returning this frame. (if frame threading isn't used) * This is also the Presentation time of this AVFrame calculated from diff --git a/libavutil/version.h b/libavutil/version.h index 50531e57d7..0235074d8c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_PKT_PTS -#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_CRYPTO_SIZE_T #define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 57) #endif |