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>

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 53297cb788b230e040087e33943509483b07eea7..89ff02eadd9b863c626914d05727dd8922735a7c 100644 (file)
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -1604,13 +1604,6 @@ static void frame_end(MpegEncContext *s)
     s->last_lambda_for [s->pict_type] = s->current_picture_ptr->f->quality;
     if (s->pict_type!= AV_PICTURE_TYPE_B)
         s->last_non_b_pict_type = s->pict_type;
-
-#if FF_API_ERROR_FRAME
-FF_DISABLE_DEPRECATION_WARNINGS
-    memcpy(s->current_picture.f->error, s->current_picture.encoding_error,
-           sizeof(s->current_picture.encoding_error));
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
 }
 
 static void update_noise_reduction(MpegEncContext *s)

diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index 255968341a9636663c5cfee1ba405b95df214c23..e694d51a67c21ca0e6d575163d16e0f9a6b69963 100644 (file)
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -1865,12 +1865,6 @@ redo_frame:
                                    (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? 4 : 0,
                                    s->current_picture->pict_type);
 
-#if FF_API_ERROR_FRAME
-FF_DISABLE_DEPRECATION_WARNINGS
-    memcpy(s->current_picture->error, s->encoding_error, sizeof(s->encoding_error));
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
     pkt->size = ff_rac_terminate(c, 0);
     if (s->current_picture->key_frame)
         pkt->flags |= AV_PKT_FLAG_KEY;

diff --git a/libavfilter/vf_swapuv.c b/libavfilter/vf_swapuv.c
index 8d62c48c4f532d7cd72920a3f0c6a075f30807ed..720e699c4a7d694ce66a61fb9f738cdf67ea9362 100644 (file)
--- a/libavfilter/vf_swapuv.c
+++ b/libavfilter/vf_swapuv.c
@@ -46,12 +46,6 @@ static void do_swap(AVFrame *frame)
     FFSWAP(uint8_t*,     frame->data[1],     frame->data[2]);
     FFSWAP(int,          frame->linesize[1], frame->linesize[2]);
     FFSWAP(AVBufferRef*, frame->buf[1],      frame->buf[2]);
-
-#if FF_API_ERROR_FRAME
-FF_DISABLE_DEPRECATION_WARNINGS
-    FFSWAP(uint64_t,     frame->error[1],    frame->error[2]);
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
 }
 
 static AVFrame *get_video_buffer(AVFilterLink *link, int w, int h)

diff --git a/libavutil/frame.c b/libavutil/frame.c
index df826fbfb738e541d1f77d16ac3e77fe915dd96c..d69dd38dc47cea70ade1eda9d64778571a4dd85e 100644 (file)
--- 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 fbecebbd701f716bbd01da33b78210cc3684e224..23396189d94280dc2ba9a65002395282d178aee6 100644 (file)
--- 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 e15bdf40ad0b6310ae2c5a7ef749b27517020d70..50531e57d7bbe09b2b14ec7e7deea44e19a9293d 100644 (file)
--- 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