From 3b56fa85e8f50db83b54518ae31ebdb3f6b0cc39 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 6 Mar 2021 20:22:14 +0100 Subject: avutil/frame: Remove deprecated AVFrame.error Deprecated in 1aa24df74c052a73175c43e57d35b4835e537ec8. Signed-off-by: Andreas Rheinhardt Signed-off-by: James Almer --- libavutil/frame.c | 6 ------ libavutil/frame.h | 8 -------- libavutil/version.h | 3 --- 3 files changed, 17 deletions(-) (limited to 'libavutil') 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 -- cgit v1.2.3