diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-06 20:22:14 +0100 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:12 -0300 |
commit | 3b56fa85e8f50db83b54518ae31ebdb3f6b0cc39 (patch) | |
tree | 1cea5cd874bf676302a24d0a9dff4f6420998817 /libavutil | |
parent | 0181162bb54ce62ec212436a12d059726d8cd1df (diff) | |
download | ffmpeg-3b56fa85e8f50db83b54518ae31ebdb3f6b0cc39.tar.gz |
avutil/frame: Remove deprecated AVFrame.error
Deprecated in 1aa24df74c052a73175c43e57d35b4835e537ec8.
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 | 6 | ||||
-rw-r--r-- | libavutil/frame.h | 8 | ||||
-rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 0 insertions, 17 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index df826fbfb7..d69dd38dc4 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -316,12 +316,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_dict_copy(&dst->metadata, src->metadata, 0); -#if FF_API_ERROR_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - memcpy(dst->error, src->error, sizeof(dst->error)); -FF_ENABLE_DEPRECATION_WARNINGS -#endif - for (i = 0; i < src->nb_side_data; i++) { const AVFrameSideData *sd_src = src->side_data[i]; AVFrameSideData *sd_dst; diff --git a/libavutil/frame.h b/libavutil/frame.h index fbecebbd70..23396189d9 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -434,14 +434,6 @@ typedef struct AVFrame { */ void *opaque; -#if FF_API_ERROR_FRAME - /** - * @deprecated unused - */ - attribute_deprecated - uint64_t error[AV_NUM_DATA_POINTERS]; -#endif - /** * When decoding, this signals how much the picture must be delayed. * extra_delay = repeat_pict / (2*fps) diff --git a/libavutil/version.h b/libavutil/version.h index e15bdf40ad..50531e57d7 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_ERROR_FRAME -#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_PKT_PTS #define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57) #endif |